Module Name: src
Committed By: matt
Date: Wed Aug 26 03:34:21 UTC 2009
Modified Files:
src/share/mk [matt-nb5-mips64]: bsd.own.mk bsd.sys.mk
Log Message:
Disable the NOPIC= hooks.
Add MKATF, MKCXX, and MKGROFF. Setting CXX to no turns of ATF and GROFF.
To generate a diff of this commit:
cvs rdiff -u -r1.542.2.9.4.1 -r1.542.2.9.4.2 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.179.8.4 -r1.179.8.5 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.542.2.9.4.1 src/share/mk/bsd.own.mk:1.542.2.9.4.2
--- src/share/mk/bsd.own.mk:1.542.2.9.4.1 Tue Aug 18 06:42:17 2009
+++ src/share/mk/bsd.own.mk Wed Aug 26 03:34:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.542.2.9.4.1 2009/08/18 06:42:17 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.542.2.9.4.2 2009/08/26 03:34:20 matt Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -643,9 +643,9 @@
.for var in \
MKATF \
MKBFD MKBINUTILS \
- MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \
+ MKCATPAGES MKCOMPLEX MKCRYPTO MKCVS MKCXX \
MKDOC \
- MKGCC MKGCCCMDS MKGDB \
+ MKGCC MKGCCCMDS MKGDB MKGROFF \
MKHESIOD MKHTML \
MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
MKKERBEROS \
@@ -687,6 +687,11 @@
# Force some options off if their dependencies are off.
#
+.if ${MKCXX} == "no"
+MKATF:= no
+MKGROFF:= no
+.endif
+
.if ${MKCRYPTO} == "no"
MKKERBEROS:= no
.endif
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.179.8.4 src/share/mk/bsd.sys.mk:1.179.8.5
--- src/share/mk/bsd.sys.mk:1.179.8.4 Sun Aug 23 23:12:39 2009
+++ src/share/mk/bsd.sys.mk Wed Aug 26 03:34:21 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.179.8.4 2009/08/23 23:12:39 matt Exp $
+# $NetBSD: bsd.sys.mk,v 1.179.8.5 2009/08/26 03:34:21 matt Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -87,17 +87,17 @@
.endif
.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-CFLAGS+= -Wa,--fatal-warnings
+CPUFLAGS+= -Wa,--fatal-warnings
.endif
#.if ${MACHINE} == "sbmips"
#CFLAGS+= -mips64 -mtune=sb1
#.endif
-.if (${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
- (defined(MKPIC) && ${MKPIC} == "no")
-CPUFLAGS+= -mno-abicalls -fno-PIC
-.endif
+#.if (${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
+# (defined(MKPIC) && ${MKPIC} == "no")
+#CPUFLAGS+= -mno-abicalls -fno-PIC
+#.endif
CFLAGS+= ${CPUFLAGS}
AFLAGS+= ${CPUFLAGS}
