Module Name: src
Committed By: matt
Date: Wed Dec 12 15:12:11 UTC 2012
Modified Files:
src/sys/lib/libsa: Makefile.inc
src/sys/lib/libz: Makefile.inc
Log Message:
Pass down an empty CPUFLAGS since CPUFLAGS is contained in CFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/lib/libsa/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/sys/lib/libz/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libsa/Makefile.inc
diff -u src/sys/lib/libsa/Makefile.inc:1.20 src/sys/lib/libsa/Makefile.inc:1.21
--- src/sys/lib/libsa/Makefile.inc:1.20 Thu May 26 12:56:31 2011
+++ src/sys/lib/libsa/Makefile.inc Wed Dec 12 15:12:11 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2011/05/26 12:56:31 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.21 2012/12/12 15:12:11 matt Exp $
#
# Configuration variables (default values are below):
#
@@ -37,7 +37,7 @@ SAMISCCPPFLAGS+=-I${ZLIBSRCDIR}
SAMAKE= \
cd ${SADST} && ${MAKE} -f ${SADIR:Q}/Makefile \
SADIR=${SADIR:Q} \
- CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+ CC=${CC:Q} CFLAGS=${CFLAGS:Q} CPUFLAGS= \
AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
LORDER=${LORDER:Q} \
TSORT=${TSORT:Q} \
Index: src/sys/lib/libz/Makefile.inc
diff -u src/sys/lib/libz/Makefile.inc:1.13 src/sys/lib/libz/Makefile.inc:1.14
--- src/sys/lib/libz/Makefile.inc:1.13 Sun Dec 11 12:24:46 2005
+++ src/sys/lib/libz/Makefile.inc Wed Dec 12 15:12:11 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2005/12/11 12:24:46 christos Exp $
+# $NetBSD: Makefile.inc,v 1.14 2012/12/12 15:12:11 matt Exp $
#
# Configuration variables (default values are below):
#
@@ -33,7 +33,7 @@ ZLIB_PROF= ${ZDST}/libz_p.a
ZMAKE= \
cd ${ZDST} && ${MAKE} -f ${ZDIR:Q}/Makefile \
ZDIR=${ZDIR:Q} \
- CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+ CC=${CC:Q} CFLAGS=${CFLAGS:Q} CPUFLAGS= \
AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
LORDER=${LORDER:Q} \
TSORT=${TSORT:Q} \