summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1999-10-13 10:59:23 +0000
committerkato <kato@FreeBSD.org>1999-10-13 10:59:23 +0000
commit1c220fd9d8c080fd568ddd0cf6e98c65adf5bc96 (patch)
tree5e71765432e0383d913ed50eb4014de9f2d92b31
parenteef5cc208d012cf53f152a68b26f2cf73ae53191 (diff)
downloadFreeBSD-src-1c220fd9d8c080fd568ddd0cf6e98c65adf5bc96.zip
FreeBSD-src-1c220fd9d8c080fd568ddd0cf6e98c65adf5bc96.tar.gz
Sync with sys/i386/conf/Makefile.i386 revision 1.160.
-rw-r--r--sys/conf/Makefile.pc984
-rw-r--r--sys/pc98/conf/Makefile.pc984
2 files changed, 8 insertions, 0 deletions
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 48492d5..7bb7164 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -70,6 +70,10 @@ PROF+= -mprofiler-epilogue
.endif
.endif
+# Put configuration-specific C flags last (except for ${PROF}) so that they
+# can override the others.
+CFLAGS+= ${CONF_CFLAGS}
+
NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
NORMAL_S= ${CC} -c ${ASM_CFLAGS} $<
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index 48492d5..7bb7164 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -70,6 +70,10 @@ PROF+= -mprofiler-epilogue
.endif
.endif
+# Put configuration-specific C flags last (except for ${PROF}) so that they
+# can override the others.
+CFLAGS+= ${CONF_CFLAGS}
+
NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
NORMAL_S= ${CC} -c ${ASM_CFLAGS} $<
OpenPOWER on IntegriCloud