summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-12 15:24:17 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-06-12 15:24:17 -0700
commita11ad6c2b3cdf13581c4329679cd3d2952323f6d (patch)
treea833854209c9003be859dd8ac9d914c3508a21a3 /core
parent0c6b27fe83a810c5a91c3aa1a4ffc0348d24b5cd (diff)
parent52b63178d9e7da82301ecbc7d673154242b1c9a6 (diff)
downloadbuild-a11ad6c2b3cdf13581c4329679cd3d2952323f6d.zip
build-a11ad6c2b3cdf13581c4329679cd3d2952323f6d.tar.gz
build-a11ad6c2b3cdf13581c4329679cd3d2952323f6d.tar.bz2
Merge "gcc 4.6 requires --copy-dt-needed-entries"
Diffstat (limited to 'core')
-rw-r--r--core/combo/TARGET_linux-x86.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 5020c84..90a275d 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -174,6 +174,7 @@ $(hide) $(PRIVATE_CXX) \
$(TARGET_GLOBAL_LDFLAGS) \
-nostdlib -Bdynamic \
-Wl,-dynamic-linker,/system/bin/linker \
+ -Wl,--copy-dt-needed-entries \
-Wl,-z,nocopyreloc \
-o $@ \
$(TARGET_GLOBAL_LD_DIRS) \