diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-13 00:02:17 +0159 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-13 00:02:48 +0159 |
| commit | c36e9cd2e3133a92672a398badce9fb62474e844 (patch) | |
| tree | d03b3aff78bded581659a9560e2f1ac06d17c513 | |
| parent | ca89e0803c49496de80a9a4112ee14b75718fced (diff) | |
| parent | 569e148827f8a0b562a3edd30246dd3cdfbad771 (diff) | |
| download | busybox-linaro-master.tar.gz | |
Merge branch 'linaro-master' of git://android.git.linaro.org/platform/external/busybox into linaro-masterlinaro-master
Change-Id: I1c533b3e45387129bdbe0a4f5937301b1a79ac85
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 29cae51cd..83b2641fe 100644 --- a/Android.mk +++ b/Android.mk @@ -2,7 +2,7 @@ include $(CLEAR_VARS) BB_TC_DIR := $(realpath $(shell dirname $(TARGET_TOOLS_PREFIX))) BB_TC_PREFIX := $(shell basename $(TARGET_TOOLS_PREFIX)) -BB_LDFLAGS := -Xlinker -z -Xlinker muldefs -nostdlib -Bdynamic -Xlinker $(shell if test $(PLATFORM_SDK_VERSION) -lt 16; then echo -e '-T../../$(BUILD_SYSTEM)/armelf.x'; fi) -Xlinker -dynamic-linker -Xlinker /system/bin/linker -Xlinker -z -Xlinker nocopyreloc -Xlinker --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) # 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 BB_LDLIBS := dl m c gcc |