From ce3a6653e08b6f9755f7d750de4433db7d37ee66 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Tue, 15 Oct 2019 18:40:42 +0200
Subject: [PATCH] Makefile: Allow specifying target gcc environment variables.

---
 Makefile                            | 2 +-
 modules/busybox                     | 2 +-
 modules/cairo                       | 2 +-
 modules/cryptsetup                  | 2 +-
 modules/dropbear                    | 2 +-
 modules/fbwhiptail                  | 2 +-
 modules/flashrom                    | 2 +-
 modules/flashtools                  | 2 +-
 modules/frotz                       | 2 +-
 modules/gpg                         | 2 +-
 modules/gpg2                        | 2 +-
 modules/kexec                       | 2 +-
 modules/libassuan                   | 2 +-
 modules/libgcrypt                   | 3 ++-
 modules/libgpg-error                | 2 +-
 modules/libksba                     | 2 +-
 modules/libpng                      | 2 +-
 modules/libremkey-hotp-verification | 2 +-
 modules/libusb                      | 2 +-
 modules/libusb-compat               | 2 +-
 modules/lvm2                        | 2 +-
 modules/mbedtls                     | 2 +-
 modules/msrtools                    | 2 +-
 modules/newt                        | 2 +-
 modules/npth                        | 2 +-
 modules/pciutils                    | 2 +-
 modules/pinentry                    | 2 +-
 modules/pixman                      | 2 +-
 modules/popt                        | 2 +-
 modules/qrencode                    | 2 +-
 modules/slang                       | 2 +-
 modules/tpmtotp                     | 2 +-
 modules/util-linux                  | 2 +-
 modules/zlib                        | 2 +-
 34 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/Makefile b/Makefile
index 41399c136..99873d466 100644
--- a/Makefile
+++ b/Makefile
@@ -462,7 +462,7 @@ $(COREBOOT_UTIL_DIR)/superiotool/superiotool \
 $(COREBOOT_UTIL_DIR)/inteltool/inteltool \
 : $(build)/$(coreboot_base_dir)/.canary
 	+$(call do,MAKE,$(notdir $@),\
-		CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH= $(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \
+		CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" $(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \
 	)
 
 # superio depends on zlib and pciutils
diff --git a/modules/busybox b/modules/busybox
index 4836780ec..b882ba990 100644
--- a/modules/busybox
+++ b/modules/busybox
@@ -11,7 +11,7 @@ busybox_hash := 604553b7dbd59ded9e3ad7c6af49ed2cff599adf3e54d9463e5e0027b362019c
 busybox_configure := $(MAKE) CC="$(heads_cc)" oldconfig
 busybox_config := config/busybox.config
 busybox_output := busybox
-busybox_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+busybox_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 busybox_target := \
 	$(CROSS_TOOLS) \
 	$(MAKE_JOBS) \
diff --git a/modules/cairo b/modules/cairo
index 00f6cac92..e3f6d08b2 100644
--- a/modules/cairo
+++ b/modules/cairo
@@ -23,7 +23,7 @@ cairo_configure := \
 	&& mv libtool-2 libtool \
 	&& chmod 755 libtool
 
-cairo_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+cairo_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 cairo_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/cryptsetup b/modules/cryptsetup
index d68da0ca5..190d89c3a 100644
--- a/modules/cryptsetup
+++ b/modules/cryptsetup
@@ -20,7 +20,7 @@ cryptsetup_configure := ./configure \
 
 # but after building, replace prefix so that they will be installed
 # in the correct directory.
-cryptsetup_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+cryptsetup_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 cryptsetup_target := \
 	$(MAKE_JOBS) \
 	&& $(MAKE) \
diff --git a/modules/dropbear b/modules/dropbear
index 834a3efcb..5703f1aba 100644
--- a/modules/dropbear
+++ b/modules/dropbear
@@ -19,7 +19,7 @@ dropbear_configure := ./configure \
 	--disable-wtmpx \
 	
 dropbear_output := ssh scp dropbear
-dropbear_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+dropbear_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 dropbear_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/fbwhiptail b/modules/fbwhiptail
index 1359677b9..1f3499023 100644
--- a/modules/fbwhiptail
+++ b/modules/fbwhiptail
@@ -6,7 +6,7 @@ fbwhiptail_version := git
 fbwhiptail_dir := fbwhiptail
 fbwhiptail_repo := https://source.puri.sm/coreboot/fbwhiptail.git
 
-fbwhiptail_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+fbwhiptail_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 fbwhiptail_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/flashrom b/modules/flashrom
index 936cd882d..fc189f7b2 100644
--- a/modules/flashrom
+++ b/modules/flashrom
@@ -11,7 +11,7 @@ flashrom_tar := flashrom-$(flashrom_version).tar.bz2
 flashrom_url := https://download.flashrom.org/releases/$(flashrom_tar)
 flashrom_hash := e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b
 
-flashrom_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+flashrom_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 flashrom_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/flashtools b/modules/flashtools
index 090362ce2..4ea087f99 100644
--- a/modules/flashtools
+++ b/modules/flashtools
@@ -11,7 +11,7 @@ flashtools_tar := flashtools-$(flashtools_version).tar.gz
 flashtools_url := https://github.com/osresearch/flashtools/archive/v$(flashtools_version).tar.gz
 flashtools_hash := e8205aa3d19e536080f5974ed06ab9a88c4c3f37870c2f6a3a08a2f39302c22c
 
-flashtools_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+flashtools_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 flashtools_target := \
 	$(CROSS_TOOLS) \
 	CFLAGS="-I$(INSTALL)/include" \
diff --git a/modules/frotz b/modules/frotz
index e2c2e22a3..185c4e66e 100644
--- a/modules/frotz
+++ b/modules/frotz
@@ -8,7 +8,7 @@ frotz_hash := dbb5eb3bc95275dcb984c4bdbaea58bc1f1b085b20092ce6e86d9f0bf3ba858f
 
 frotz_configure := touch .config
 
-frotz_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+frotz_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 frotz_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/gpg b/modules/gpg
index 6a486646d..70dee7d7c 100644
--- a/modules/gpg
+++ b/modules/gpg
@@ -39,7 +39,7 @@ gpg_configure := ./configure \
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
-gpg_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+gpg_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 gpg_target := $(MAKE_JOBS) \
 	&& $(MAKE) -C $(build)/$(gpg_dir) \
 		DESTDIR="$(INSTALL)" \
diff --git a/modules/gpg2 b/modules/gpg2
index 522e51881..1d104e07a 100644
--- a/modules/gpg2
+++ b/modules/gpg2
@@ -50,7 +50,7 @@ gpg2_configure := ./configure \
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
-gpg2_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+gpg2_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 gpg2_target := $(MAKE_JOBS) \
 	&& $(MAKE) -C $(build)/$(gpg2_dir) \
 		DESTDIR="$(INSTALL)" \
diff --git a/modules/kexec b/modules/kexec
index 7e9c563f2..19a75e4ab 100644
--- a/modules/kexec
+++ b/modules/kexec
@@ -14,7 +14,7 @@ kexec_configure := ./configure \
 	--without-lzma \
 	&& $(MAKE) clean
 
-kexec_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+kexec_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 kexec_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/libassuan b/modules/libassuan
index 6138ec27e..adf48dbbd 100644
--- a/modules/libassuan
+++ b/modules/libassuan
@@ -14,7 +14,7 @@ libassuan_configure := ./configure \
 	--with-libgpg-error-prefix="$(INSTALL)" \
 	--disable-asm \
 
-libassuan_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+libassuan_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 libassuan_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libgcrypt b/modules/libgcrypt
index a36400b7f..867f2cf2f 100644
--- a/modules/libgcrypt
+++ b/modules/libgcrypt
@@ -13,7 +13,8 @@ libgcrypt_configure := ./configure \
 	--with-libgpg-error-prefix="$(INSTALL)" \
 	--disable-asm \
 
-libgcrypt_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+libgcrypt_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_
+C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 libgcrypt_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libgpg-error b/modules/libgpg-error
index 3d4d217ef..a36e04379 100644
--- a/modules/libgpg-error
+++ b/modules/libgpg-error
@@ -16,7 +16,7 @@ libgpg-error_configure := ./configure \
 	--disable-tests \
 	--disable-asm \
 
-libgpg-error_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH= CC_FOR_BUILD="$(CC_FOR_BUILD)"
+libgpg-error_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" CC_FOR_BUILD="$(CC_FOR_BUILD)"
 libgpg-error_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libksba b/modules/libksba
index bd1835bf6..9f8ba6949 100644
--- a/modules/libksba
+++ b/modules/libksba
@@ -14,7 +14,7 @@ libksba_configure := ./configure \
 	--with-libgpg-error-prefix="$(INSTALL)" \
 	--disable-asm \
 
-libksba_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+libksba_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 libksba_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libpng b/modules/libpng
index 33306e2fb..c657a20e2 100644
--- a/modules/libpng
+++ b/modules/libpng
@@ -12,7 +12,7 @@ libpng_configure := \
         --host i386-elf-linux \
 	--prefix="/" \
 
-libpng_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+libpng_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 libpng_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/libremkey-hotp-verification b/modules/libremkey-hotp-verification
index 420b031b0..d0a9dfa05 100644
--- a/modules/libremkey-hotp-verification
+++ b/modules/libremkey-hotp-verification
@@ -8,7 +8,7 @@ libremkey-hotp-verification_tar := nitrokey-hotp-verification-$(libremkey-hotp-v
 libremkey-hotp-verification_url := https://github.com/Nitrokey/nitrokey-hotp-verification/archive/$(libremkey-hotp-verification_version).tar.gz
 libremkey-hotp-verification_hash := 668113ebc21cc875d49266c8d3a47acfd524a8d6b64f75b7ce5833d595415469
 
-libremkey-hotp-verification_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+libremkey-hotp-verification_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 libremkey-hotp-verification_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/libusb b/modules/libusb
index fe274e96e..5646a93e7 100644
--- a/modules/libusb
+++ b/modules/libusb
@@ -19,7 +19,7 @@ libusb_configure := ./configure\
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
 
-libusb_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+libusb_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 libusb_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/libusb-compat b/modules/libusb-compat
index 78033ef87..17fd7295e 100644
--- a/modules/libusb-compat
+++ b/modules/libusb-compat
@@ -22,7 +22,7 @@ libusb-compat_configure := ./configure \
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
-libusb-compat_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+libusb-compat_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 libusb-compat_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/lvm2 b/modules/lvm2
index 73913be1d..091e862ea 100644
--- a/modules/lvm2
+++ b/modules/lvm2
@@ -34,7 +34,7 @@ lvm2_configure := \
 	--with-cluster=none \
 
 # not sure why LIB_SUFFIX is not defined in the cross build
-lvm2_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+lvm2_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 lvm2_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/mbedtls b/modules/mbedtls
index 2611866c6..77cf18f3b 100644
--- a/modules/mbedtls
+++ b/modules/mbedtls
@@ -10,7 +10,7 @@ mbedtls_libraries := library/libmbedcrypto.so.0
 
 mbedtls_configure :=
 
-mbedtls_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+mbedtls_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 mbedtls_target := \
 	SHARED=1 \
 	DESTDIR=$(INSTALL) \
diff --git a/modules/msrtools b/modules/msrtools
index a29723e0a..f21162f9b 100644
--- a/modules/msrtools
+++ b/modules/msrtools
@@ -12,7 +12,7 @@ msrtools_tar := msr-tools-$(msrtools_version).tar.gz
 msrtools_url := https://github.com/osresearch/msr-tools/archive/$(msrtools_version).tar.gz
 msrtools_hash := 80554790d0a404205fe215c9ae8d2de159e980ec23821d636f201f12550e6ac0
 
-msrtools_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+msrtools_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 msrtools_target := \
 	$(CROSS_TOOLS) \
 	CFLAGS="-I$(INSTALL)/include" \
diff --git a/modules/newt b/modules/newt
index bad67c793..97077f66d 100644
--- a/modules/newt
+++ b/modules/newt
@@ -8,7 +8,7 @@ newt_tar := newt-$(newt_version).tar.gz
 newt_url := https://releases.pagure.org/newt/$(newt_tar)
 newt_hash := 8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc
 
-newt_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+newt_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 newt_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/npth b/modules/npth
index a43d6268a..9c4c8ae61 100644
--- a/modules/npth
+++ b/modules/npth
@@ -14,7 +14,7 @@ npth_configure := ./configure \
 	--with-libgpg-error-prefix="$(INSTALL)" \
 	--disable-asm \
 
-npth_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+npth_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 npth_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \
 	$(CROSS_TOOLS) \
diff --git a/modules/pciutils b/modules/pciutils
index dfee3a069..2bcd2aca1 100644
--- a/modules/pciutils
+++ b/modules/pciutils
@@ -16,7 +16,7 @@ pciutils_hash := 64293c6ab9318c40ef262b76d87bd9097531759752bac556e50979b1e63cfe6
 # reproducible.  Otherwise the build path will be embedded
 # in the library and executables.
 
-pciutils_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+pciutils_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 pciutils_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/pinentry b/modules/pinentry
index a541ce0b7..e9975dda1 100644
--- a/modules/pinentry
+++ b/modules/pinentry
@@ -33,7 +33,7 @@ pinentry_configure := ./configure \
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries
 # into our actual target location
-pinentry_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+pinentry_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 pinentry_target := $(MAKE_JOBS) \
 	&& $(MAKE) -C $(build)/$(pinentry_dir) \
 		DESTDIR="$(INSTALL)" \
diff --git a/modules/pixman b/modules/pixman
index 198f8ac20..452e6820a 100644
--- a/modules/pixman
+++ b/modules/pixman
@@ -13,7 +13,7 @@ pixman_configure := \
 	--prefix="/" \
 	--disable-gtk
 
-pixman_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+pixman_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 pixman_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/popt b/modules/popt
index 242ae0392..aa2dd8633 100644
--- a/modules/popt
+++ b/modules/popt
@@ -11,7 +11,7 @@ popt_configure := ./configure \
 	--prefix "/" \
 	--host i386-elf-linux \
 
-popt_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+popt_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 popt_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/qrencode b/modules/qrencode
index afded700a..73c5a0095 100644
--- a/modules/qrencode
+++ b/modules/qrencode
@@ -14,7 +14,7 @@ qrencode_configure := ./configure \
 	--without-tools \
 	--host i386-elf-linux \
 
-qrencode_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+qrencode_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 qrencode_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/slang b/modules/slang
index a3386396e..e520aa84e 100644
--- a/modules/slang
+++ b/modules/slang
@@ -18,7 +18,7 @@ slang_configure := ./configure \
   && mkdir -p src/elfobjs
 
 # Disable parallel make for the install target
-slang_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+slang_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 slang_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/tpmtotp b/modules/tpmtotp
index 568ac857a..853435a70 100644
--- a/modules/tpmtotp
+++ b/modules/tpmtotp
@@ -11,7 +11,7 @@ tpmtotp_tar := tpmtotp-$(tpmtotp_version).tar.gz
 tpmtotp_url := https://github.com/osresearch/tpmtotp/archive/$(tpmtotp_version).tar.gz
 tpmtotp_hash := 1082f2b0e4af833e04220dddedcc21a39eb39ee4dc5668bb010e7bcc795c606c
 
-tpmtotp_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+tpmtotp_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 tpmtotp_target := \
 	$(CROSS_TOOLS) \
 	CFLAGS="-I$(INSTALL)/include" \
diff --git a/modules/util-linux b/modules/util-linux
index a50bf4069..e5339a4ae 100644
--- a/modules/util-linux
+++ b/modules/util-linux
@@ -22,7 +22,7 @@ util-linux_configure := ./configure \
 	--enable-libblkid \
 
 
-util-linux_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+util-linux_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 util-linux_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
diff --git a/modules/zlib b/modules/zlib
index a6290b2d2..b9c4178d9 100644
--- a/modules/zlib
+++ b/modules/zlib
@@ -12,7 +12,7 @@ zlib_configure := \
 	./configure \
 	--prefix="/" \
 
-zlib_make_environment := CPATH= C_INCLUDE_PATH= CPLUS_INCLUDE_PATH= LIBRARY_PATH=
+zlib_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)"
 zlib_target := \
 	$(MAKE_JOBS) \
 	$(CROSS_TOOLS) \