From a04395531661c5e8d314125d5ae77d4cbedd5d73 Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 18 Sep 2021 01:47:07 +0000 Subject: [PATCH] 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 --- build.sh | 6 ++++-- distrib/sets/maketars | 4 ++-- external/gpl3/binutils/dist/bfd/doc/Makefile.in | 3 ++- external/gpl3/binutils/dist/binutils/Makefile.in | 10 +++++----- external/gpl3/gcc/lib/liblto_plugin/Makefile | 3 ++- external/gpl3/gcc/usr.bin/Makefile.prog | 3 ++- external/gpl3/gcc/usr.bin/backend/Makefile | 3 ++- external/gpl3/gcc/usr.bin/common-target/Makefile | 3 ++- external/gpl3/gcc/usr.bin/common/Makefile | 3 ++- external/gpl3/gcc/usr.bin/frontend/Makefile | 3 ++- external/gpl3/gcc/usr.bin/host-libiberty/Makefile | 6 ++++-- external/gpl3/gcc/usr.bin/libcpp/Makefile | 3 ++- external/gpl3/gcc/usr.bin/libdecnumber/Makefile | 3 ++- external/gpl3/gdb/bin/gdb/Makefile | 3 ++- external/gpl3/gdb/bin/gdbserver/Makefile | 3 ++- external/gpl3/gdb/bin/gdbtui/Makefile | 3 ++- external/gpl3/gdb/lib/libgdb/Makefile | 3 ++- external/gpl3/gdb/lib/libgdbsupport/Makefile | 3 ++- external/lgpl3/gmp/dist/Makefile.in | 12 ++++++------ external/lgpl3/gmp/lib/libgmp/Makefile | 14 +++++++------- tools/binutils/Makefile | 3 ++- tools/compat/Makefile | 12 ++++++------ tools/fdisk/Makefile | 4 ++-- tools/gcc/Makefile | 5 +++-- tools/gmp/Makefile | 4 +++- tools/sunlabel/Makefile | 4 ++-- tools/uudecode/Makefile | 4 ++-- tools/vgrind/Makefile | 4 ++-- tools/xz-include/Makefile | 4 ++-- 29 files changed, 80 insertions(+), 58 deletions(-) diff --git a/build.sh b/build.sh index c19aaa8e03b3..bd863fe9bd66 100755 --- a/build.sh +++ b/build.sh @@ -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 <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}' < $< > $@ diff --git a/external/gpl3/gcc/lib/liblto_plugin/Makefile b/external/gpl3/gcc/lib/liblto_plugin/Makefile index a136b8793d7e..be01538e94c4 100644 --- a/external/gpl3/gcc/lib/liblto_plugin/Makefile +++ b/external/gpl3/gcc/lib/liblto_plugin/Makefile @@ -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 .include @@ -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 \ diff --git a/external/gpl3/gcc/usr.bin/Makefile.prog b/external/gpl3/gcc/usr.bin/Makefile.prog index 885278987383..07a8e2c16f01 100644 --- a/external/gpl3/gcc/usr.bin/Makefile.prog +++ b/external/gpl3/gcc/usr.bin/Makefile.prog @@ -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} diff --git a/external/gpl3/gcc/usr.bin/backend/Makefile b/external/gpl3/gcc/usr.bin/backend/Makefile index cef0183f3b96..65211e7f46f0 100644 --- a/external/gpl3/gcc/usr.bin/backend/Makefile +++ b/external/gpl3/gcc/usr.bin/backend/Makefile @@ -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} \ diff --git a/external/gpl3/gcc/usr.bin/common-target/Makefile b/external/gpl3/gcc/usr.bin/common-target/Makefile index fa083deeed60..32e51921356e 100644 --- a/external/gpl3/gcc/usr.bin/common-target/Makefile +++ b/external/gpl3/gcc/usr.bin/common-target/Makefile @@ -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} diff --git a/external/gpl3/gcc/usr.bin/common/Makefile b/external/gpl3/gcc/usr.bin/common/Makefile index 4f2251bc50e0..4c63703426d4 100644 --- a/external/gpl3/gcc/usr.bin/common/Makefile +++ b/external/gpl3/gcc/usr.bin/common/Makefile @@ -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} diff --git a/external/gpl3/gcc/usr.bin/frontend/Makefile b/external/gpl3/gcc/usr.bin/frontend/Makefile index 71d1787c6e24..05e682a2c941 100644 --- a/external/gpl3/gcc/usr.bin/frontend/Makefile +++ b/external/gpl3/gcc/usr.bin/frontend/Makefile @@ -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} diff --git a/external/gpl3/gcc/usr.bin/host-libiberty/Makefile b/external/gpl3/gcc/usr.bin/host-libiberty/Makefile index aae4941a18c5..7c7e20952317 100644 --- a/external/gpl3/gcc/usr.bin/host-libiberty/Makefile +++ b/external/gpl3/gcc/usr.bin/host-libiberty/Makefile @@ -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 diff --git a/external/gpl3/gcc/usr.bin/libcpp/Makefile b/external/gpl3/gcc/usr.bin/libcpp/Makefile index 74a0d22f5ada..2eaade9ef361 100644 --- a/external/gpl3/gcc/usr.bin/libcpp/Makefile +++ b/external/gpl3/gcc/usr.bin/libcpp/Makefile @@ -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} diff --git a/external/gpl3/gcc/usr.bin/libdecnumber/Makefile b/external/gpl3/gcc/usr.bin/libdecnumber/Makefile index 04e5c029178a..b112eec3399a 100644 --- a/external/gpl3/gcc/usr.bin/libdecnumber/Makefile +++ b/external/gpl3/gcc/usr.bin/libdecnumber/Makefile @@ -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} diff --git a/external/gpl3/gdb/bin/gdb/Makefile b/external/gpl3/gdb/bin/gdb/Makefile index 5911ed934611..be9fc6b5494a 100644 --- a/external/gpl3/gdb/bin/gdb/Makefile +++ b/external/gpl3/gdb/bin/gdb/Makefile @@ -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 @@ -108,6 +108,7 @@ DPADD+= ${LIBEXPAT} ${LIBLZMA} ${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM # 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 diff --git a/external/gpl3/gdb/bin/gdbserver/Makefile b/external/gpl3/gdb/bin/gdbserver/Makefile index f59786e540c2..ad026af0e0e8 100644 --- a/external/gpl3/gdb/bin/gdbserver/Makefile +++ b/external/gpl3/gdb/bin/gdbserver/Makefile @@ -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}/libgdbsupport.a \ # 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 diff --git a/external/gpl3/gdb/bin/gdbtui/Makefile b/external/gpl3/gdb/bin/gdbtui/Makefile index 14d80ce1bc14..d4fb325d32f0 100644 --- a/external/gpl3/gdb/bin/gdbtui/Makefile +++ b/external/gpl3/gdb/bin/gdbtui/Makefile @@ -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 diff --git a/external/gpl3/gdb/lib/libgdb/Makefile b/external/gpl3/gdb/lib/libgdb/Makefile index d51c69f3e027..e8e9a6755a77 100644 --- a/external/gpl3/gdb/lib/libgdb/Makefile +++ b/external/gpl3/gdb/lib/libgdb/Makefile @@ -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 diff --git a/external/gpl3/gdb/lib/libgdbsupport/Makefile b/external/gpl3/gdb/lib/libgdbsupport/Makefile index 93bb029e4128..8ba1a5947be0 100644 --- a/external/gpl3/gdb/lib/libgdbsupport/Makefile +++ b/external/gpl3/gdb/lib/libgdbsupport/Makefile @@ -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 diff --git a/external/lgpl3/gmp/dist/Makefile.in b/external/lgpl3/gmp/dist/Makefile.in index f6e40685d15c..4de5d779f338 100644 --- a/external/lgpl3/gmp/dist/Makefile.in +++ b/external/lgpl3/gmp/dist/Makefile.in @@ -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_BUILD) ./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_BUILD) ./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 diff --git a/external/lgpl3/gmp/lib/libgmp/Makefile b/external/lgpl3/gmp/lib/libgmp/Makefile index 70a617c4d8cf..9a569169b96c 100644 --- a/external/lgpl3/gmp/lib/libgmp/Makefile +++ b/external/lgpl3/gmp/lib/libgmp/Makefile @@ -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 @@ -160,13 +160,13 @@ DPSRCS= fac_table.h fib_table.h fib_table.c jacobitab.h mp_bases.h \ 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 diff --git a/tools/binutils/Makefile b/tools/binutils/Makefile index 2213662fbce6..34f161294d84 100644 --- a/tools/binutils/Makefile +++ b/tools/binutils/Makefile @@ -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 @@ -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. diff --git a/tools/compat/Makefile b/tools/compat/Makefile index b42319b61f13..b272934c5487 100644 --- a/tools/compat/Makefile +++ b/tools/compat/Makefile @@ -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 diff --git a/tools/fdisk/Makefile b/tools/fdisk/Makefile index bf2ee7426724..9e08becab92a 100644 --- a/tools/fdisk/Makefile +++ b/tools/fdisk/Makefile @@ -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" diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile index e9e68ff089ca..ff3b01cf33cc 100644 --- a/tools/gcc/Makefile +++ b/tools/gcc/Makefile @@ -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 @@ -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= \ diff --git a/tools/gmp/Makefile b/tools/gmp/Makefile index 4e6f8205f32b..2896be3ee278 100644 --- a/tools/gmp/Makefile +++ b/tools/gmp/Makefile @@ -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. diff --git a/tools/sunlabel/Makefile b/tools/sunlabel/Makefile index 8cb2d8f6b089..93786431e0fb 100644 --- a/tools/sunlabel/Makefile +++ b/tools/sunlabel/Makefile @@ -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" diff --git a/tools/uudecode/Makefile b/tools/uudecode/Makefile index 0bc794fed8e4..4a095f7cbb83 100644 --- a/tools/uudecode/Makefile +++ b/tools/uudecode/Makefile @@ -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" diff --git a/tools/vgrind/Makefile b/tools/vgrind/Makefile index cf514ebd970b..2b1c1bada236 100644 --- a/tools/vgrind/Makefile +++ b/tools/vgrind/Makefile @@ -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} diff --git a/tools/xz-include/Makefile b/tools/xz-include/Makefile index de909583d629..94c44e34e4bc 100644 --- a/tools/xz-include/Makefile +++ b/tools/xz-include/Makefile @@ -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 @@ -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