[src/trunk]: src/tools If you are going to append things to CPPFLAGS and then...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/15688c2c9bf8
branches:  trunk
changeset: 783344:15688c2c9bf8
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Dec 16 06:47:39 2012 +0000

description:
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.

diffstat:

 tools/libctf/Makefile   |  4 ++--
 tools/libdwarf/Makefile |  4 ++--
 tools/libelf/Makefile   |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r f08df58cca6c -r 15688c2c9bf8 tools/libctf/Makefile
--- a/tools/libctf/Makefile     Sun Dec 16 00:54:36 2012 +0000
+++ b/tools/libctf/Makefile     Sun Dec 16 06:47:39 2012 +0000
@@ -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 @@
 .PATH:         ${OPENSOLARIS_DISTDIR}/common/ctf
 .PATH:         ${OPENSOLARIS_DISTDIR}/lib/libctf/common
 
-HOST_CPPFLAGS:=        ${CPPFLAGS}
+HOST_CPPFLAGS:=        ${CPPFLAGS} ${HOST_CPPFLAGS}
 CPPFLAGS:=     # empty
 
 realinstall: install.host
diff -r f08df58cca6c -r 15688c2c9bf8 tools/libdwarf/Makefile
--- a/tools/libdwarf/Makefile   Sun Dec 16 00:54:36 2012 +0000
+++ b/tools/libdwarf/Makefile   Sun Dec 16 06:47:39 2012 +0000
@@ -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 @@
 
 .PATH:         ${LIBDWARF_DIR}
 
-HOST_CPPFLAGS:=        ${CPPFLAGS}
+HOST_CPPFLAGS:=        ${CPPFLAGS} ${HOST_CPPFLAGS}
 CPPFLAGS:=     # empty
 
 .include "${.CURDIR}/../Makefile.nbincludes"
diff -r f08df58cca6c -r 15688c2c9bf8 tools/libelf/Makefile
--- a/tools/libelf/Makefile     Sun Dec 16 00:54:36 2012 +0000
+++ b/tools/libelf/Makefile     Sun Dec 16 06:47:39 2012 +0000
@@ -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 @@
 
 .PATH:         ${LIBELF_DIR}
 
-HOST_CPPFLAGS:=        ${CPPFLAGS}
+HOST_CPPFLAGS:=        ${CPPFLAGS} ${HOST_CPPFLAGS}
 CPPFLAGS:=     # empty
 
 .include "${.CURDIR}/../Makefile.nbincludes"