summaryrefslogtreecommitdiff
path: root/configure.py
diff options
context:
space:
mode:
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/configure.py b/configure.py
index a791efebbc..cc805d3fd1 100755
--- a/configure.py
+++ b/configure.py
@@ -47,7 +47,7 @@ parser = optparse.OptionParser()
valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
'android', 'aix', 'cloudabi')
valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
- 'ppc64', 'x32','x64', 'x86', 'x86_64', 's390', 's390x')
+ 'ppc64', 'x32','x64', 'x86', 'x86_64', 's390x')
valid_arm_float_abi = ('soft', 'softfp', 'hard')
valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
@@ -867,7 +867,6 @@ def host_arch_cc():
'__PPC64__' : 'ppc64',
'__PPC__' : 'ppc64',
'__x86_64__' : 'x64',
- '__s390__' : 's390',
'__s390x__' : 's390x',
}
@@ -876,8 +875,7 @@ def host_arch_cc():
for i in matchup:
if i in k and k[i] != '0':
rtn = matchup[i]
- if rtn != 's390':
- break
+ break
if rtn == 'mipsel' and '_LP64' in k:
rtn = 'mips64el'