Module Name: src
Committed By: christos
Date: Sat Sep 18 01:47:11 UTC 2021
Modified Files:
src: build.sh
src/distrib/sets: maketars
src/external/gpl3/binutils/dist/bfd/doc: Makefile.in
src/external/gpl3/binutils/dist/binutils: Makefile.in
src/external/gpl3/gcc/lib/liblto_plugin: Makefile
src/external/gpl3/gcc/usr.bin: Makefile.prog
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/common: Makefile
src/external/gpl3/gcc/usr.bin/common-target: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
src/external/gpl3/gcc/usr.bin/host-libiberty: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile
src/external/gpl3/gcc/usr.bin/libdecnumber: Makefile
src/external/gpl3/gdb/bin/gdb: Makefile
src/external/gpl3/gdb/bin/gdbserver: Makefile
src/external/gpl3/gdb/bin/gdbtui: Makefile
src/external/gpl3/gdb/lib/libgdb: Makefile
src/external/gpl3/gdb/lib/libgdbsupport: Makefile
src/external/lgpl3/gmp/dist: Makefile.in
src/external/lgpl3/gmp/lib/libgmp: Makefile
src/tools/binutils: Makefile
src/tools/compat: Makefile
src/tools/fdisk: Makefile
src/tools/gcc: Makefile
src/tools/gmp: Makefile
src/tools/sunlabel: Makefile
src/tools/uudecode: Makefile
src/tools/vgrind: Makefile
src/tools/xz-include: Makefile
Log Message:
Patch the build script and toolchain to allow passing through
HOST_CPPFLAGS, HOST_CXXFLAGS, but not LIBRARY_PATH because it breaks
the build. These variables are necessary to support building NetBSD
from a GNU Guix or NixOS host, where /usr/include, /lib, and all
but /bin/sh do not exist. In many cases, support for HOST_CPPFLAGS
was incomplete. From Ryan Sundberg
To generate a diff of this commit:
cvs rdiff -u -r1.357 -r1.358 src/build.sh
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/maketars
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/bfd/doc/Makefile.in
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/binutils/dist/binutils/Makefile.in
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/liblto_plugin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/Makefile.prog
cvs rdiff -u -r1.65 -r1.66 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gdb/bin/gdb/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/bin/gdbserver/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/bin/gdbtui/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/gpl3/gdb/lib/libgdb/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libgdbsupport/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/dist/Makefile.in
cvs rdiff -u -r1.28 -r1.29 src/external/lgpl3/gmp/lib/libgmp/Makefile
cvs rdiff -u -r1.32 -r1.33 src/tools/binutils/Makefile
cvs rdiff -u -r1.89 -r1.90 src/tools/compat/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tools/fdisk/Makefile
cvs rdiff -u -r1.104 -r1.105 src/tools/gcc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/gmp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/sunlabel/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/uudecode/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/vgrind/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/xz-include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.357 src/build.sh:1.358
--- src/build.sh:1.357 Fri Sep 17 17:22:38 2021
+++ src/build.sh Fri Sep 17 21:47:07 2021
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.357 2021/09/17 21:22:38 joerg Exp $
+# $NetBSD: build.sh,v 1.358 2021/09/18 01:47:07 christos Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -473,6 +473,8 @@ level of source directory"
# These variables can be overridden via "-V var=value" if
# you know what you are doing.
#
+ unsetmakeenv C_INCLUDE_PATH
+ unsetmakeenv CPLUS_INCLUDE_PATH
unsetmakeenv INFODIR
unsetmakeenv LESSCHARSET
unsetmakeenv MAKEFLAGS
@@ -1972,7 +1974,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.357 2021/09/17 21:22:38 joerg Exp $
+# Generated from: \$NetBSD: build.sh,v 1.358 2021/09/18 01:47:07 christos Exp $
# with these arguments: ${_args}
#
Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.91 src/distrib/sets/maketars:1.92
--- src/distrib/sets/maketars:1.91 Mon May 18 17:19:34 2020
+++ src/distrib/sets/maketars Fri Sep 17 21:47:07 2021
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: maketars,v 1.91 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: maketars,v 1.92 2021/09/18 01:47:07 christos Exp $
#
# Make release tar files for some or all lists. Usage:
# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -166,7 +166,7 @@ TMPFILES=
cleanup()
{
es=$?
- /bin/rm -rf "${SDIR}" ${TMPFILES}
+ rm -rf "${SDIR}" ${TMPFILES}
trap - 0
exit ${es}
}
Index: src/external/gpl3/binutils/dist/bfd/doc/Makefile.in
diff -u src/external/gpl3/binutils/dist/bfd/doc/Makefile.in:1.9 src/external/gpl3/binutils/dist/bfd/doc/Makefile.in:1.10
--- src/external/gpl3/binutils/dist/bfd/doc/Makefile.in:1.9 Fri Apr 3 19:48:46 2020
+++ src/external/gpl3/binutils/dist/bfd/doc/Makefile.in Fri Sep 17 21:47:07 2021
@@ -934,7 +934,8 @@ uninstall-am: uninstall-dvi-am uninstall
$(MKDOC): chew.stamp ; @true
chew.stamp: $(srcdir)/chew.c
$(CC_FOR_BUILD) -o chw$$$$$(EXEEXT_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
- $(LDFLAGS_FOR_BUILD) $(H_CFLAGS) $(AM_CPPFLAGS) $(srcdir)/chew.c; \
+ $(LDFLAGS_FOR_BUILD) $(H_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(srcdir)/chew.c; \
$(SHELL) $(srcdir)/../../move-if-change \
chw$$$$$(EXEEXT_FOR_BUILD) $(MKDOC); \
touch $@
Index: src/external/gpl3/binutils/dist/binutils/Makefile.in
diff -u src/external/gpl3/binutils/dist/binutils/Makefile.in:1.9 src/external/gpl3/binutils/dist/binutils/Makefile.in:1.10
--- src/external/gpl3/binutils/dist/binutils/Makefile.in:1.9 Fri Apr 3 19:48:46 2020
+++ src/external/gpl3/binutils/dist/binutils/Makefile.in Fri Sep 17 21:47:07 2021
@@ -1477,20 +1477,20 @@ sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sy
./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@
- $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@
+ $(CC_FOR_BUILD) $(CPPFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@
syslex_wrap.@OBJEXT@: syslex_wrap.c syslex.c sysinfo.h config.h
- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c
+ $(CC_FOR_BUILD) $(CPPFLAGS) -c -I. -I$(srcdir) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c
sysinfo.@OBJEXT@: sysinfo.c
if [ -r sysinfo.c ]; then \
- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
+ $(CC_FOR_BUILD) $(CPPFLAGS) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
else \
- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
+ $(CC_FOR_BUILD) $(CPPFLAGS) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
fi
bin2c$(EXEEXT_FOR_BUILD): bin2c.c
- $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
+ $(CC_FOR_BUILD) $(CPPFLAGS) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
embedspu: embedspu.sh Makefile
awk '/^program_transform_name=/ {print "program_transform_name=\"$(program_transform_name)\""; next} {print}' < $< > $@
Index: src/external/gpl3/gcc/lib/liblto_plugin/Makefile
diff -u src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.9 src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.10
--- src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.9 Tue Nov 14 04:04:17 2017
+++ src/external/gpl3/gcc/lib/liblto_plugin/Makefile Fri Sep 17 21:47:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/11/14 09:04:17 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2021/09/18 01:47:07 christos Exp $
.include <bsd.init.mk>
.include <bsd.shlib.mk>
@@ -46,6 +46,7 @@ config.h: Makefile
(cd .ab && \
AWK=${TOOL_AWK:Q} \
CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} \
+ CPPFLAGS=${HOST_CPPFLAGS:Q} \
MAKE=${MAKE:Q} \
CONFIG_SHELL=${HOST_SH:Q} \
${HOST_SH} ${DIST}/libiberty/configure \
Index: src/external/gpl3/gcc/usr.bin/Makefile.prog
diff -u src/external/gpl3/gcc/usr.bin/Makefile.prog:1.1 src/external/gpl3/gcc/usr.bin/Makefile.prog:1.2
--- src/external/gpl3/gcc/usr.bin/Makefile.prog:1.1 Fri Feb 1 05:34:18 2019
+++ src/external/gpl3/gcc/usr.bin/Makefile.prog Fri Sep 17 21:47:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.prog,v 1.1 2019/02/01 10:34:18 mrg Exp $
+# $NetBSD: Makefile.prog,v 1.2 2021/09/18 01:47:08 christos Exp $
# common fragment for any thing linking with C++
@@ -11,6 +11,7 @@ HOSTPROG_CXX= 1
# Force using C++ for this
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS:= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS}
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.65 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.66
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.65 Tue Apr 13 02:30:36 2021
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Fri Sep 17 21:47:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2021/04/13 06:30:36 mrg Exp $
+# $NetBSD: Makefile,v 1.66 2021/09/18 01:47:08 christos Exp $
LIBISPRIVATE= yes
@@ -222,6 +222,7 @@ auto-build.h: gmp.h Makefile
(cd .ab && \
AWK=${TOOL_AWK:Q} \
CC=${ORIGHOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} \
+ CPPFLAGS=${HOST_CPPFLAGS:Q} \
CXX=${HOST_CXX:Q} CXXFLAGS=${HOST_CXXFLAGS:Q} \
MAKE=${TOOL_GMAKE:Q} \
CONFIG_SHELL=${HOST_SH:Q} \
Index: src/external/gpl3/gcc/usr.bin/common/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common/Makefile:1.10 src/external/gpl3/gcc/usr.bin/common/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/common/Makefile:1.10 Sat Sep 5 10:24:26 2020
+++ src/external/gpl3/gcc/usr.bin/common/Makefile Fri Sep 17 21:47:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/09/05 14:24:26 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2021/09/18 01:47:08 christos Exp $
LIBISPRIVATE= yes
@@ -34,6 +34,7 @@ ${SRCS}: ${GCCARCH}/defs.mk
# Force using C++ for this
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS:= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS}
Index: src/external/gpl3/gcc/usr.bin/common-target/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.10 src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.10 Tue Sep 15 01:19:35 2020
+++ src/external/gpl3/gcc/usr.bin/common-target/Makefile Fri Sep 17 21:47:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/09/15 05:19:35 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2021/09/18 01:47:08 christos Exp $
LIBISPRIVATE= yes
@@ -49,6 +49,7 @@ HOSTPROG_CXX= 1
# Force using C++ for this
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS:= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS}
Index: src/external/gpl3/gcc/usr.bin/frontend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.13 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.14
--- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.13 Fri Feb 1 05:32:32 2019
+++ src/external/gpl3/gcc/usr.bin/frontend/Makefile Fri Sep 17 21:47:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/02/01 10:32:32 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2021/09/18 01:47:08 christos Exp $
LIBISPRIVATE= yes
@@ -32,6 +32,7 @@ MKPICLIB:= no
# Force using C++ for this
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS:= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS}
Index: src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile
diff -u src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile:1.3 src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile:1.3 Sat Mar 15 20:07:58 2014
+++ src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile Fri Sep 17 21:47:08 2021
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2014/03/16 00:07:58 uwe Exp $
+# $NetBSD: Makefile,v 1.4 2021/09/18 01:47:08 christos Exp $
libiberty/libiberty.a:
[ ! -d libiberty ] && mkdir libiberty || true
(cd libiberty; \
CC=${HOST_CC:Q} \
CFLAGS=${HOST_CFLAGS:Q} \
+ CPPFLAGS=${HOST_CPPFLAGS:Q} \
MAKE=${MAKE:Q} \
CONFIG_SHELL=${HOST_SH:Q} \
${HOST_SH} ${DIST}/libiberty/configure \
- && CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} ${MAKE})
+ && CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} \
+ CPPFLAGS=${HOST_CPPFLAGS:Q} ${MAKE})
cleandir:
-rm -rf libiberty
Index: src/external/gpl3/gcc/usr.bin/libcpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.8 src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.8 Sat Feb 10 21:12:29 2018
+++ src/external/gpl3/gcc/usr.bin/libcpp/Makefile Fri Sep 17 21:47:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/02/11 02:12:29 christos Exp $
+# $NetBSD: Makefile,v 1.9 2021/09/18 01:47:08 christos Exp $
LIBISPRIVATE= yes
@@ -21,6 +21,7 @@ COPTS+= -Wno-stack-protector
# Force using C++ for this
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS:= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS}
Index: src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile
diff -u src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.7 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.7 Sat Feb 10 21:12:29 2018
+++ src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile Fri Sep 17 21:47:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/02/11 02:12:29 christos Exp $
+# $NetBSD: Makefile,v 1.8 2021/09/18 01:47:09 christos Exp $
DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
@@ -23,6 +23,7 @@ HOSTPROG_CXX= 1
# Force using C++ for this
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS:= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS}
Index: src/external/gpl3/gdb/bin/gdb/Makefile
diff -u src/external/gpl3/gdb/bin/gdb/Makefile:1.20 src/external/gpl3/gdb/bin/gdb/Makefile:1.21
--- src/external/gpl3/gdb/bin/gdb/Makefile:1.20 Sat Dec 5 22:28:25 2020
+++ src/external/gpl3/gdb/bin/gdb/Makefile Fri Sep 17 21:47:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/12/06 03:28:25 christos Exp $
+# $NetBSD: Makefile,v 1.21 2021/09/18 01:47:09 christos Exp $
NOCTF=
.include <bsd.own.mk>
@@ -108,6 +108,7 @@ DPADD+= ${LIBEXPAT} ${LIBLZMA} ${LIBZ}
# Force c++
CWARNFLAGS.clang+= -Wno-deprecated
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS+= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
Index: src/external/gpl3/gdb/bin/gdbserver/Makefile
diff -u src/external/gpl3/gdb/bin/gdbserver/Makefile:1.4 src/external/gpl3/gdb/bin/gdbserver/Makefile:1.5
--- src/external/gpl3/gdb/bin/gdbserver/Makefile:1.4 Sun Jun 20 08:29:58 2021
+++ src/external/gpl3/gdb/bin/gdbserver/Makefile Fri Sep 17 21:47:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/06/20 12:29:58 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2021/09/18 01:47:09 christos Exp $
NOCTF=
NOMAN=
@@ -56,6 +56,7 @@ DPADD+= ${LIBGDBSUPPORTDIR}/libgdbsuppor
# Force c++
CWARNFLAGS.clang+= -Wno-deprecated
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS+= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector -pthread
Index: src/external/gpl3/gdb/bin/gdbtui/Makefile
diff -u src/external/gpl3/gdb/bin/gdbtui/Makefile:1.14 src/external/gpl3/gdb/bin/gdbtui/Makefile:1.15
--- src/external/gpl3/gdb/bin/gdbtui/Makefile:1.14 Sat Dec 5 22:28:26 2020
+++ src/external/gpl3/gdb/bin/gdbtui/Makefile Fri Sep 17 21:47:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/12/06 03:28:26 christos Exp $
+# $NetBSD: Makefile,v 1.15 2021/09/18 01:47:09 christos Exp $
NOCTF=
.include "../Makefile.inc"
@@ -33,6 +33,7 @@ NOMAN= # defined
# Force c++
CWARNFLAGS.clang+= -Wno-deprecated
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS+= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
Index: src/external/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.31 src/external/gpl3/gdb/lib/libgdb/Makefile:1.32
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.31 Mon May 31 18:33:19 2021
+++ src/external/gpl3/gdb/lib/libgdb/Makefile Fri Sep 17 21:47:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/05/31 22:33:19 rin Exp $
+# $NetBSD: Makefile,v 1.32 2021/09/18 01:47:09 christos Exp $
NOCTF=
HOSTPROG_CXX= 1
@@ -46,6 +46,7 @@ CWARNFLAGS.clang+= -Wno-switch
# Force c++
CWARNFLAGS.clang+= -Wno-deprecated
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS+= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS} -std=gnu++17 -Wno-error=stack-protector
Index: src/external/gpl3/gdb/lib/libgdbsupport/Makefile
diff -u src/external/gpl3/gdb/lib/libgdbsupport/Makefile:1.1 src/external/gpl3/gdb/lib/libgdbsupport/Makefile:1.2
--- src/external/gpl3/gdb/lib/libgdbsupport/Makefile:1.1 Thu Sep 17 12:36:39 2020
+++ src/external/gpl3/gdb/lib/libgdbsupport/Makefile Fri Sep 17 21:47:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/09/17 16:36:39 christos Exp $
+# $NetBSD: Makefile,v 1.2 2021/09/18 01:47:09 christos Exp $
NOCTF=
HOSTPROG_CXX= 1
@@ -45,6 +45,7 @@ CWARNFLAGS.clang+= -Wno-switch
# Force c++
CWARNFLAGS.clang+= -Wno-deprecated
HOST_CC:= ${HOST_CXX}
+HOST_CFLAGS+= ${HOST_CXXFLAGS}
CC:= ${CXX}
CFLAGS:= ${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
Index: src/external/lgpl3/gmp/dist/Makefile.in
diff -u src/external/lgpl3/gmp/dist/Makefile.in:1.6 src/external/lgpl3/gmp/dist/Makefile.in:1.7
--- src/external/lgpl3/gmp/dist/Makefile.in:1.6 Sun Jul 11 17:15:45 2021
+++ src/external/lgpl3/gmp/dist/Makefile.in Fri Sep 17 21:47:10 2021
@@ -1452,7 +1452,7 @@ fac_table.h: gen-fac$(EXEEXT_FOR_BUILD)
./gen-fac $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >fac_table.h || (rm -f fac_table.h; exit 1)
gen-fac$(EXEEXT_FOR_BUILD): gen-fac$(U_FOR_BUILD).c bootstrap.c
- $(CC_FOR_BUILD) `test -f 'gen-fac$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fac$(U_FOR_BUILD).c -o gen-fac$(EXEEXT_FOR_BUILD)
+ $(CC_FOR_BUILD) $(CPPFLAGS) `test -f 'gen-fac$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fac$(U_FOR_BUILD).c -o gen-fac$(EXEEXT_FOR_BUILD)
fib_table.h: gen-fib$(EXEEXT_FOR_BUILD)
./gen-fib header $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >fib_table.h || (rm -f fib_table.h; exit 1)
@@ -1461,7 +1461,7 @@ mpn/fib_table.c: gen-fib$(EXEEXT_FOR_BUI
./gen-fib table $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mpn/fib_table.c || (rm -f mpn/fib_table.c; exit 1)
gen-fib$(EXEEXT_FOR_BUILD): gen-fib$(U_FOR_BUILD).c bootstrap.c
- $(CC_FOR_BUILD) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fib$(U_FOR_BUILD).c -o gen-fib$(EXEEXT_FOR_BUILD)
+ $(CC_FOR_BUILD) $(CPPFLAGS) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fib$(U_FOR_BUILD).c -o gen-fib$(EXEEXT_FOR_BUILD)
mp_bases.h: gen-bases$(EXEEXT_FOR_BUILD)
./gen-bases header $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mp_bases.h || (rm -f mp_bases.h; exit 1)
@@ -1470,25 +1470,25 @@ mpn/mp_bases.c: gen-bases$(EXEEXT_FOR_BU
./gen-bases table $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mpn/mp_bases.c || (rm -f mpn/mp_bases.c; exit 1)
gen-bases$(EXEEXT_FOR_BUILD): gen-bases$(U_FOR_BUILD).c bootstrap.c
- $(CC_FOR_BUILD) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-bases$(U_FOR_BUILD).c -o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
+ $(CC_FOR_BUILD) $(CPPFLAGS) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-bases$(U_FOR_BUILD).c -o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
trialdivtab.h: gen-trialdivtab$(EXEEXT_FOR_BUILD)
./gen-trialdivtab $(GMP_LIMB_BITS) 8000 >trialdivtab.h || (rm -f trialdivtab.h; exit 1)
gen-trialdivtab$(EXEEXT_FOR_BUILD): gen-trialdivtab$(U_FOR_BUILD).c bootstrap.c
- $(CC_FOR_BUILD) `test -f 'gen-trialdivtab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-trialdivtab$(U_FOR_BUILD).c -o gen-trialdivtab$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
+ $(CC_FOR_BUILD) $(CPPFLAGS) `test -f 'gen-trialdivtab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-trialdivtab$(U_FOR_BUILD).c -o gen-trialdivtab$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
mpn/jacobitab.h: gen-jacobitab$(EXEEXT_FOR_BUILD)
./gen-jacobitab >mpn/jacobitab.h || (rm -f mpn/jacobitab.h; exit 1)
gen-jacobitab$(EXEEXT_FOR_BUILD): gen-jacobitab$(U_FOR_BUILD).c
- $(CC_FOR_BUILD) `test -f 'gen-jacobitab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-jacobitab$(U_FOR_BUILD).c -o gen-jacobitab$(EXEEXT_FOR_BUILD)
+ $(CC_FOR_BUILD) $(CPPFLAGS) `test -f 'gen-jacobitab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-jacobitab$(U_FOR_BUILD).c -o gen-jacobitab$(EXEEXT_FOR_BUILD)
mpn/perfsqr.h: gen-psqr$(EXEEXT_FOR_BUILD)
./gen-psqr $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mpn/perfsqr.h || (rm -f mpn/perfsqr.h; exit 1)
gen-psqr$(EXEEXT_FOR_BUILD): gen-psqr$(U_FOR_BUILD).c bootstrap.c
- $(CC_FOR_BUILD) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
+ $(CC_FOR_BUILD) $(CPPFLAGS) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
# Avoid: CVS - cvs directories
# *~ - emacs backups
Index: src/external/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.28 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.29
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.28 Tue Sep 4 02:09:31 2018
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Fri Sep 17 21:47:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2018/09/04 06:09:31 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2021/09/18 01:47:10 christos Exp $
.include <bsd.init.mk>
@@ -160,13 +160,13 @@ DPSRCS= fac_table.h fib_table.h fib_tabl
mp_bases.c perfsqr.h trialdivtab.h
gen-fac: gen-fac.c
- ${HOST_CC} -o ${.OBJDIR}/gen-fac ${.ALLSRC}
+ ${HOST_CC} ${HOST_CPPFLAGS} -o ${.OBJDIR}/gen-fac ${.ALLSRC}
fac_table.h: gen-fac
${.OBJDIR}/gen-fac ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/fac_table.h
gen-fib: gen-fib.c
- ${HOST_CC} -o ${.OBJDIR}/gen-fib ${.ALLSRC}
+ ${HOST_CC} ${HOST_CPPFLAGS} -o ${.OBJDIR}/gen-fib ${.ALLSRC}
fib_table.h: gen-fib
${.OBJDIR}/gen-fib header ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/fib_table.h
@@ -175,7 +175,7 @@ fib_table.c: gen-fib
${.OBJDIR}/gen-fib table ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/fib_table.c
gen-bases: gen-bases.c
- ${HOST_CC} -o ${.OBJDIR}/gen-bases ${.ALLSRC} -lm
+ ${HOST_CC} ${HOST_CPPFLAGS} -o ${.OBJDIR}/gen-bases ${.ALLSRC} -lm
mp_bases.h: gen-bases
${.OBJDIR}/gen-bases header ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/mp_bases.h
@@ -184,17 +184,17 @@ mp_bases.c: gen-bases
${.OBJDIR}/gen-bases table ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/mp_bases.c
gen-jacobitab: gen-jacobitab.c
- ${HOST_CC} -o ${.OBJDIR}/gen-jacobitab ${.ALLSRC} -lm
+ ${HOST_CC} ${HOST_CPPFLAGS} -o ${.OBJDIR}/gen-jacobitab ${.ALLSRC} -lm
jacobitab.h: gen-jacobitab
${.OBJDIR}/gen-jacobitab > ${.OBJDIR}/jacobitab.h
perfsqr.h: gen-psqr.c
- ${HOST_CC} -o ${.OBJDIR}/gen-psqr ${.ALLSRC}
+ ${HOST_CC} ${HOST_CPPFLAGS} -o ${.OBJDIR}/gen-psqr ${.ALLSRC}
${.OBJDIR}/gen-psqr ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/perfsqr.h
gen-trialdivtab: gen-trialdivtab.c
- ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
+ ${HOST_CC} ${HOST_CPPFLAGS} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
trialdiv.c: trialdivtab.h
trialdivtab.h: gen-trialdivtab Makefile
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.32 src/tools/binutils/Makefile:1.33
--- src/tools/binutils/Makefile:1.32 Fri May 7 19:00:04 2021
+++ src/tools/binutils/Makefile Fri Sep 17 21:47:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/05/07 23:00:04 christos Exp $
+# $NetBSD: Makefile,v 1.33 2021/09/18 01:47:10 christos Exp $
.include <bsd.hostinit.mk>
@@ -36,6 +36,7 @@ INSTALL_TARGET+=install-gprof
CCADDFLAGS= -I${GNUHOSTDIST}/include -I${DESTDIR}/usr/include
CCADDFLAGS+= -B${DESTDIR}/usr/lib/
+CCADDFLAGS+= ${HOST_CPPFLAGS}
LDADDFLAGS= -L${DESTDIR}/lib -L${DESTDIR}/usr/lib
# Force avoiding possibly non-executable install-sh.
Index: src/tools/compat/Makefile
diff -u src/tools/compat/Makefile:1.89 src/tools/compat/Makefile:1.90
--- src/tools/compat/Makefile:1.89 Thu Feb 25 08:41:58 2021
+++ src/tools/compat/Makefile Fri Sep 17 21:47:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2021/02/25 13:41:58 christos Exp $
+# $NetBSD: Makefile,v 1.90 2021/09/18 01:47:10 christos Exp $
HOSTLIB= nbcompat
@@ -31,13 +31,13 @@ BUILD_OSTYPE!= uname -s
# Disable use of pre-compiled headers on Darwin.
.if ${BUILD_OSTYPE} == "Darwin"
-CPPFLAGS+= -no-cpp-precomp
+HOST_CPPFLAGS+= -no-cpp-precomp
.endif
# -D_FILE_OFFSET_BITS=64 produces a much more amenable `struct stat', and
# other file ops, on many systems, without changing function names.
-CPPFLAGS+= -I. -I./include -I${.CURDIR} -I${.CURDIR}/sys \
+HOST_CPPFLAGS+= -I. -I./include -I${.CURDIR} -I${.CURDIR}/sys \
-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
.PATH: ${.CURDIR}/../../lib/libc/cdb \
@@ -84,7 +84,8 @@ CONFIGURE_ARGS+=--silent
config.cache: include/.stamp configure nbtool_config.h.in defs.mk.in
rm -f ${.TARGET}
- CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} LDFLAGS=${HOST_LDFLAGS:Q} \
+ CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} CPPFLAGS=${HOST_CPPFLAGS:Q} \
+ LDFLAGS=${HOST_LDFLAGS:Q} \
${HOST_SH} ${.CURDIR}/configure ${CONFIGURE_ARGS}
defs.mk: config.cache
@@ -149,8 +150,7 @@ ${HOST_SHAREDIR}/compat/defs.mk: defs.mk
# bsd.hostlib.mk wants HOST_CPPFLAGS, not CPPFLAGS
-HOST_CPPFLAGS:= ${CPPFLAGS}
-CPPFLAGS:= # empty
+HOST_CPPFLAGS+= ${CPPFLAGS}
.include <bsd.hostlib.mk>
Index: src/tools/fdisk/Makefile
diff -u src/tools/fdisk/Makefile:1.7 src/tools/fdisk/Makefile:1.8
--- src/tools/fdisk/Makefile:1.7 Tue Jun 5 09:41:23 2012
+++ src/tools/fdisk/Makefile Fri Sep 17 21:47:10 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2012/06/05 13:41:23 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8 2021/09/18 01:47:10 christos Exp $
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-fdisk
HOST_SRCDIR= sbin/fdisk
HOST_SRCS= disklabel.c
-HOST_CPPFLAGS= -DDEFAULT_BOOTDIR=\"${DESTDIR}/usr/mdec\"
+HOST_CPPFLAGS+= -DDEFAULT_BOOTDIR=\"${DESTDIR}/usr/mdec\"
.include "${.CURDIR}/../Makefile.nbincludes"
.include "${.CURDIR}/../Makefile.host"
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.104 src/tools/gcc/Makefile:1.105
--- src/tools/gcc/Makefile:1.104 Sat May 8 15:36:28 2021
+++ src/tools/gcc/Makefile Fri Sep 17 21:47:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2021/05/08 19:36:28 christos Exp $
+# $NetBSD: Makefile,v 1.105 2021/09/18 01:47:10 christos Exp $
.include <bsd.hostinit.mk>
@@ -71,7 +71,8 @@ CONFIGURE_ARGS+= \
--enable-languages="${GCC_LANGUAGES}"
GCC_CPPFLAGS= -DNETBSD_TOOLS -DTARGET_SYSTEM_ROOT=0 \
- -DTARGET_SYSTEM_ROOT_RELOCATABLE
+ -DTARGET_SYSTEM_ROOT_RELOCATABLE
+# ${HOST_CPPFLAGS}
MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \
Index: src/tools/gmp/Makefile
diff -u src/tools/gmp/Makefile:1.4 src/tools/gmp/Makefile:1.5
--- src/tools/gmp/Makefile:1.4 Sat Sep 26 16:56:53 2020
+++ src/tools/gmp/Makefile Fri Sep 17 21:47:10 2021
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2020/09/26 20:56:53 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2021/09/18 01:47:10 christos Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/lgpl3/gmp/dist
CONFIGURE_ARGS+=--disable-shared
+CPPFLAGS+= ${HOST_CPPFLAGS}
+
.include "${.CURDIR}/../Makefile.gnuhost"
# Don't override CFLAGS and CXXFLAGS, it breaks ABI detection.
Index: src/tools/sunlabel/Makefile
diff -u src/tools/sunlabel/Makefile:1.4 src/tools/sunlabel/Makefile:1.5
--- src/tools/sunlabel/Makefile:1.4 Tue Nov 11 21:18:27 2003
+++ src/tools/sunlabel/Makefile Fri Sep 17 21:47:11 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/11/12 02:18:27 matt Exp $
+# $NetBSD: Makefile,v 1.5 2021/09/18 01:47:11 christos Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}sunlabel
HOST_SRCDIR= usr.sbin/sunlabel
-HOST_CPPFLAGS= -DDISTRIB -DNO_S_COMMAND -DNO_TERMCAP_WIDTH
+HOST_CPPFLAGS+= -DDISTRIB -DNO_S_COMMAND -DNO_TERMCAP_WIDTH
.include "${.CURDIR}/../Makefile.host"
Index: src/tools/uudecode/Makefile
diff -u src/tools/uudecode/Makefile:1.3 src/tools/uudecode/Makefile:1.4
--- src/tools/uudecode/Makefile:1.3 Sun Sep 24 17:43:14 2006
+++ src/tools/uudecode/Makefile Fri Sep 17 21:47:11 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/09/24 21:43:14 dbj Exp $
+# $NetBSD: Makefile,v 1.4 2021/09/18 01:47:11 christos Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}uudecode
HOST_SRCDIR= usr.bin/uudecode
-HOST_CPPFLAGS= -DNO_BASE64
+HOST_CPPFLAGS+= -DNO_BASE64
.include "${.CURDIR}/../Makefile.host"
Index: src/tools/vgrind/Makefile
diff -u src/tools/vgrind/Makefile:1.3 src/tools/vgrind/Makefile:1.4
--- src/tools/vgrind/Makefile:1.3 Fri May 17 09:51:36 2019
+++ src/tools/vgrind/Makefile Fri Sep 17 21:47:11 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2019/05/17 13:51:36 nakayama Exp $
+# $NetBSD: Makefile,v 1.4 2021/09/18 01:47:11 christos Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}vfontedpr
HOST_BINDIR= ${TOOLDIR}/libexec
HOST_SRCDIR= usr.bin/vgrind
HOST_FILESDIR= ${TOOLDIR}/share/misc
-HOST_CPPFLAGS= -D_PATH_VGRINDEFS=\"${HOST_FILESDIR}/vgrindefs\"
+HOST_CPPFLAGS+= -D_PATH_VGRINDEFS=\"${HOST_FILESDIR}/vgrindefs\"
HOSTFILES= vgrindefs vgrindefs.db
NOSHARE=# defined
CLEANFILES+= ${HOSTFILES}
Index: src/tools/xz-include/Makefile
diff -u src/tools/xz-include/Makefile:1.3 src/tools/xz-include/Makefile:1.4
--- src/tools/xz-include/Makefile:1.3 Sat Jun 13 06:49:17 2020
+++ src/tools/xz-include/Makefile Fri Sep 17 21:47:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/06/13 10:49:17 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2021/09/18 01:47:11 christos Exp $
.include <bsd.hostinit.mk>
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --silent
config.status: ${XZSRCDIR}/configure
${HOST_SH} ${XZSRCDIR}/configure ${CONFIGURE_ARGS} \
- CC=${HOST_CC:Q}
+ CC=${HOST_CC:Q} CPPFLAGS=${HOST_CPPFLAGS:Q}
CLEANFILES+= config.log config.status config.h libtool stamp-h1
