aboutsummaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-10-27 14:37:56 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-10-27 14:56:52 +0100
commit212adf32f31f751ba104bc70de7344b2f2714289 (patch)
tree88fb24ae5da3b2be4f0765e8fcd2b4cc5ae8fbc3 /toolchain
parentd4d4056e63a9fa09d1ac0ecb390d4c677ebbb45d (diff)
downloadbuildroot-212adf32f31f751ba104bc70de7344b2f2714289.tar.gz
buildroot-212adf32f31f751ba104bc70de7344b2f2714289.tar.bz2
toolchain/toolchain: set TOOLCHAIN_INSTALL_STAGING only once
Currently, we set TOOLCHAIN_INSTALL_STAGING three times: once (conditionally) in toolchain.mk, and once each (unconditionally) in pkg-cmake.mk and pkg-meson.mk. This is a little bit messy... Set it just once, unconditionally, in toolchain.mk where it belongs. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/toolchain/toolchain.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk
index 17fb62147e..0afb12c036 100644
--- a/toolchain/toolchain/toolchain.mk
+++ b/toolchain/toolchain/toolchain.mk
@@ -11,6 +11,7 @@ TOOLCHAIN_DEPENDENCIES += toolchain-external
endif
TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO
+TOOLCHAIN_INSTALL_STAGING = YES
# Apply a hack that Rick Felker suggested[1] to avoid conflicts between libc
# headers and kernel headers. This is needed for kernel headers older than
@@ -34,7 +35,6 @@ define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK
$(STAGING_DIR)/usr/include/linux/libc-compat.h
endef
TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK
-TOOLCHAIN_INSTALL_STAGING = YES
endif
# Install default nsswitch.conf file if the skeleton doesn't provide it