| commit | 2436ea8a8c84d58befb4bf27d137d94c45b8cc8d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed May 16 06:42:53 2012 -0700 |
| committer | android code review <noreply-gerritcodereview@google.com> | Wed May 16 06:42:55 2012 -0700 |
| tree | 45d9f6b2be667fad6447ef0022d19c5f6bc0e9bc | |
| parent | 9db21482369c20120d6f4c1078ce7e0405ba3148 [diff] | |
| parent | 402d7f3654cc3ad58b1df5d2ba12e908b57f861b [diff] |
Merge "Use i686-linux-android-4.6 for x86 build"
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 987afd4..7b2378d 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk
@@ -289,7 +289,7 @@ endef define transform-o-to-static-executable-inner -$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ +$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ -Wl,--gc-sections \ -o $@ \ $(TARGET_GLOBAL_LD_DIRS) \