aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-11-27 21:36:48 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-12-03 15:00:47 +0100
commitaec15539e13075cbf5a1cc4871cdc8d2d10015d0 (patch)
tree942c0998e59ad1008c4940a54e5a63a772f1978b
parenta4ea288caccfbc45e6224b6aac1a13252d8eabf4 (diff)
downloadbuildroot-aec15539e13075cbf5a1cc4871cdc8d2d10015d0.tar.gz
buildroot-aec15539e13075cbf5a1cc4871cdc8d2d10015d0.tar.bz2
package/nodejs: properly pass HOST_LDFLAGS when building host tools
After building host tools, we currently run a pass of patchelf to add the proper RPATH to these tools so that they are able to find the libraries they depend on. Unfortunately, the "torque" host tool is used during the build itself, before we have a chance to run "patchelf" on it. Since it is linked against libcrypto.so available in $(HOST_DIR)/lib, the build aborts because the RPATH is not set. To fix this, we make sure that $(HOST_LDFLAGS) are properly taken into account: since they contain the -Wl,-rpath option, the host tools will have the correct RPATH. This both fixes the build failure, and makes the patchelf hack no longer necessary. Fixes: https://bugs.busybox.net/show_bug.cgi?id=12211 http://autobuild.buildroot.net/results/a1f5e336ddaf386ba08eb5a7a299a48e2bdfe2d9/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit f4abcbe112a0a45b87545f32981be87212116e94) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/nodejs/nodejs.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 3bd6a1c4dd..583b2276e2 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -72,6 +72,7 @@ define HOST_NODEJS_BUILD_CMDS
$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
$(MAKE) -C $(@D) \
$(HOST_CONFIGURE_OPTS) \
+ LDFLAGS.host="$(HOST_LDFLAGS)" \
NO_LOAD=cctest.target.mk \
PATH=$(@D)/bin:$(BR_PATH)
endef
@@ -80,6 +81,7 @@ define HOST_NODEJS_INSTALL_CMDS
$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
$(MAKE) -C $(@D) install \
$(HOST_CONFIGURE_OPTS) \
+ LDFLAGS.host="$(HOST_LDFLAGS)" \
NO_LOAD=cctest.target.mk \
PATH=$(@D)/bin:$(BR_PATH)
endef