aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenĂ© Korthaus <[email protected]>2015-08-28 22:57:50 +0200
committerRenĂ© Korthaus <[email protected]>2015-08-28 22:57:50 +0200
commit69e2654a4f4c46209f2be20c687f1ec154c044de (patch)
tree0888878d8bed15776e0858cfd8520cd4c8b95259
parent58329e7602e07468396ba29d6404c01ce5edec42 (diff)
Allow multiple abi link flags with the same name
Allow multiple ABI link flags with the same name, e.g., -arch armv7 -arch armv7s when cross-compiling for iOS. This is the first fix necessary for fixing #188.
-rwxr-xr-xconfigure.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.py b/configure.py
index 7622a8991..d37a624f1 100755
--- a/configure.py
+++ b/configure.py
@@ -848,19 +848,19 @@ class CompilerInfo(object):
return 'all-debug'
return 'all'
- abi_link = set()
+ abi_link = list()
for what in [all(), options.os, options.arch, options.cpu]:
flag = self.mach_abi_linking.get(what)
if flag != None and flag != '':
- abi_link.add(flag)
+ abi_link.append(flag)
for flag in options.cc_abi_flags.split(' '):
if flag != '':
- abi_link.add(flag)
+ abi_link.append(flag)
if len(abi_link) == 0:
return ''
- abi_flags = ' '.join(sorted(list(abi_link)))
+ abi_flags = ' '.join(abi_link)
if options.build_mode == 'coverage':
if self.coverage_flags == '':