Module Name: src
Committed By: apb
Date: Sun Dec 16 06:47:39 UTC 2012
Modified Files:
src/tools/libctf: Makefile
src/tools/libdwarf: Makefile
src/tools/libelf: Makefile
Log Message:
If you are going to append things to CPPFLAGS and then transfer
the result to HOST_CPPFLAGS later, then also include the value of
HOST_CPPFLAGS in this process. This should fix a problem in which the
value of HOST_CPPFLAGS set by compat/defs.mk was lost during a build
with MKDTRACE=yes.
XXX: It would probably be better to just use HOST_CPPFLAGS throughout.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tools/libctf/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/libdwarf/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tools/libelf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/libctf/Makefile
diff -u src/tools/libctf/Makefile:1.4 src/tools/libctf/Makefile:1.5
--- src/tools/libctf/Makefile:1.4 Sun Dec 2 12:48:32 2012
+++ src/tools/libctf/Makefile Sun Dec 16 06:47:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/12/02 12:48:32 apb Exp $
+# $NetBSD: Makefile,v 1.5 2012/12/16 06:47:39 apb Exp $
HOSTLIB= ctf
@@ -51,7 +51,7 @@ CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -D_F
.PATH: ${OPENSOLARIS_DISTDIR}/common/ctf
.PATH: ${OPENSOLARIS_DISTDIR}/lib/libctf/common
-HOST_CPPFLAGS:= ${CPPFLAGS}
+HOST_CPPFLAGS:= ${CPPFLAGS} ${HOST_CPPFLAGS}
CPPFLAGS:= # empty
realinstall: install.host
Index: src/tools/libdwarf/Makefile
diff -u src/tools/libdwarf/Makefile:1.4 src/tools/libdwarf/Makefile:1.5
--- src/tools/libdwarf/Makefile:1.4 Sun Dec 2 12:48:32 2012
+++ src/tools/libdwarf/Makefile Sun Dec 16 06:47:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/12/02 12:48:32 apb Exp $
+# $NetBSD: Makefile,v 1.5 2012/12/16 06:47:39 apb Exp $
HOSTLIB=dwarf
@@ -45,7 +45,7 @@ CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -D_F
.PATH: ${LIBDWARF_DIR}
-HOST_CPPFLAGS:= ${CPPFLAGS}
+HOST_CPPFLAGS:= ${CPPFLAGS} ${HOST_CPPFLAGS}
CPPFLAGS:= # empty
.include "${.CURDIR}/../Makefile.nbincludes"
Index: src/tools/libelf/Makefile
diff -u src/tools/libelf/Makefile:1.6 src/tools/libelf/Makefile:1.7
--- src/tools/libelf/Makefile:1.6 Sun Dec 2 12:48:33 2012
+++ src/tools/libelf/Makefile Sun Dec 16 06:47:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/12/02 12:48:33 apb Exp $
+# $NetBSD: Makefile,v 1.7 2012/12/16 06:47:39 apb Exp $
HOSTLIB= elf
@@ -73,7 +73,7 @@ COMPATLIB_NO_LIB= yes # only the include
.PATH: ${LIBELF_DIR}
-HOST_CPPFLAGS:= ${CPPFLAGS}
+HOST_CPPFLAGS:= ${CPPFLAGS} ${HOST_CPPFLAGS}
CPPFLAGS:= # empty
.include "${.CURDIR}/../Makefile.nbincludes"
