aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-01-15 12:29:35 +0100
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-01-15 12:29:35 +0100
commit0e3e6434987490164139f1534ddec6daa6ff87ed (patch)
treea99f529baebde06a3a342f8b1b85057c9cf7959f
parent6a5207956e46684c22e418da261579dac54c17fb (diff)
downloadbusybox-linaro-1.19.tar.gz
busybox: Add -L$(TARGET_OUT_SHARED_LIBRARIES)linaro-1.19
Allow linking to a shared libc. This fixes the build of juice-aosp. Change-Id: I2798fa33e0c8df294765537f19cc8831d18cdca0 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index aa3f45442..9dc4f84a0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -218,7 +218,7 @@ BUSYBOX_TOOLS := \
BB_TC_DIR := $(realpath $(shell dirname $(TARGET_TOOLS_PREFIX)))
BB_TC_PREFIX := $(shell basename $(TARGET_TOOLS_PREFIX))
-BB_LDFLAGS := -nostdlib -Bdynamic -Wl,-z,muldefs$(shell if test $(PLATFORM_SDK_VERSION) -lt 16; then echo -ne ',-T../../$(BUILD_SYSTEM)/armelf.x'; fi),-dynamic-linker,/system/bin/linker,-z,nocopyreloc,--no-undefined ../../$(TARGET_CRTBEGIN_DYNAMIC_O) ../../$(TARGET_CRTEND_O) -L../../$(TARGET_OUT_STATIC_LIBRARIES)
+BB_LDFLAGS := -nostdlib -Bdynamic -Wl,-z,muldefs$(shell if test $(PLATFORM_SDK_VERSION) -lt 16; then echo -ne ',-T../../$(BUILD_SYSTEM)/armelf.x'; fi),-dynamic-linker,/system/bin/linker,-z,nocopyreloc,--no-undefined ../../$(TARGET_CRTBEGIN_DYNAMIC_O) ../../$(TARGET_CRTEND_O) -L../../$(TARGET_OUT_STATIC_LIBRARIES) -L../../$(TARGET_OUT_SHARED_LIBRARIES)
# FIXME remove -fno-strict-aliasing once all aliasing violations are fixed
BB_COMPILER_FLAGS := $(subst -I ,-I../../,$(subst -include ,-include ../../,$(TARGET_GLOBAL_CFLAGS))) -I../../bionic/libc/include -I../../bionic/libc/kernel/common -I../../bionic/libc/arch-arm/include -I../../bionic/libc/kernel/arch-arm -I../../bionic/libm/include -fno-stack-protector -Wno-error=format-security -fno-strict-aliasing -U_FORTIFY_SOURCE
BB_LDLIBS := dl m c gcc