summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2012-09-07 14:22:43 +0200
committerAndoni Morales Alastruey <ylatuya@gmail.com>2012-09-07 14:22:43 +0200
commitc68cedd94cff18aa4bbb2a5b9528c5c3a51fcf03 (patch)
tree8e8c704688abc8d9bc8f0a5736818c32793f81b9 /config
parenteab39b29b646e683830ff60b7f2ee16377fd168c (diff)
android.config: pass -fuse-ld=gold to LDFLAGS too
Diffstat (limited to 'config')
-rw-r--r--config/android.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/android.config b/config/android.config
index 2a40fe0..4cd9e44 100644
--- a/config/android.config
+++ b/config/android.config
@@ -35,8 +35,8 @@ ccache = use_ccache and 'ccache ' or ''
# Toolchain environment
os.environ['CPPFLAGS'] = "-fuse-ld=gold --sysroot=%s -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -DANDROID -DPIC -I%s/usr/include" % (sysroot, sysroot)
-os.environ['CFLAGS'] += "--sysroot=%s -fPIC -DPIC -ffunction-sections -funwind-tables -fstack-protector -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -march=armv5te -mtune=xscale -msoft-float -mthumb -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wa,--noexecstack -I%s/usr/include" % (sysroot, sysroot)
-os.environ['LDFLAGS'] = "-fuse-ld=gold --sysroot=%s -fPIC -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--gc-sections -Wl,-z,nocopyreloc -Wl,-dynamic-linker,/system/bin/linker -L%s/usr/lib %s" % (sysroot, sysroot, os.environ.get('LDFLAGS', ''))
+os.environ['CFLAGS'] += "-fuse-ld=gold --sysroot=%s -fPIC -DPIC -ffunction-sections -funwind-tables -fstack-protector -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -march=armv5te -mtune=xscale -msoft-float -mthumb -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wa,--noexecstack -I%s/usr/include" % (sysroot, sysroot)
+os.environ['LDFLAGS'] = "--sysroot=%s -fPIC -Wl,-no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--gc-sections -Wl,-z,nocopyreloc -Wl,-dynamic-linker,/system/bin/linker -L%s/usr/lib %s" % (sysroot, sysroot, os.environ.get('LDFLAGS', ''))
os.environ['CXXFLAGS']=os.environ['CFLAGS']
def cmd(command):