summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnout Vandecappelle <arnout@mind.be>2012-11-20 22:15:36 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-11-21 10:07:35 (GMT)
commit5e0f1e1fcfbaca2b33397b3076a55b23b0e02cd8 (patch)
tree7f721b7f445460ec21d29bd1de8ab08ec3561937
parentcd0f43a2c56e1ac2cb30c0af15cb7029e668a219 (diff)
downloadbuildroot-5e0f1e1fcfbaca2b33397b3076a55b23b0e02cd8.tar.gz
buildroot-5e0f1e1fcfbaca2b33397b3076a55b23b0e02cd8.tar.bz2
busybox: fix link with tirpc
Busybox does partial linking of its modules before linking everything together into the binary. Those partial links are done without the standard libraries, but that also means -ltirpc can't be found. In addition, this probably fails horribly with static linking (untested). The problem is that the LDFLAGS are also used in the partial links. So instead, use CFLAGS_busybox, which is only used for the busybox link step. Also make sure that this is passed through the environment, not on the command line, so the busybox Makefile can still append to it. Fixes e.g. http://autobuild.buildroot.net/results/e8351e3ba86fdcdb2999548658271a6fde0526a9 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/busybox/busybox.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 549e150..9154c08 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -27,12 +27,17 @@ BUSYBOX_LDFLAGS = \
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
BUSYBOX_DEPENDENCIES += libtirpc
BUSYBOX_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
-BUSYBOX_LDFLAGS += -ltirpc
+# Don't use LDFLAGS for -ltirpc, because LDFLAGS is used for
+# the non-final link of modules as well.
+BUSYBOX_CFLAGS_busybox += -ltirpc
endif
BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config
# Allows the build system to tweak CFLAGS
-BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(BUSYBOX_CFLAGS)"
+BUSYBOX_MAKE_ENV = \
+ $(TARGET_MAKE_ENV) \
+ CFLAGS="$(BUSYBOX_CFLAGS)" \
+ CFLAGS_busybox="$(BUSYBOX_CFLAGS_busybox)"
BUSYBOX_MAKE_OPTS = \
CC="$(TARGET_CC)" \
ARCH=$(KERNEL_ARCH) \