diff options
author | Nils Philippsen <nils@tiptoe.de> | 2013-11-09 10:54:47 +0100 |
---|---|---|
committer | Nils Philippsen <nils@tiptoe.de> | 2013-12-09 12:16:54 +0100 |
commit | b4cb506ceaae9254fa5e6fd25b4d936daa826712 (patch) | |
tree | 7b8dd329a8062e243b25c743714f09542a196327 /wscript | |
parent | bbd79b6792cb6113eac417a4c8a099fa32bc2788 (diff) |
improve architecture detection
Recognize ppc64, ppc, s390x, s390 CPUs, default to 'none' instead of
i686 (which tries to build with SSE and fails on non-x86 architectures).
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -182,16 +182,15 @@ def set_compiler_flags (conf,opt): else: conf.env['build_target'] = 'mountainlion' else: - if re.search ("x86_64", cpu) != None: - conf.env['build_target'] = 'x86_64' - elif re.search("i[0-5]86", cpu) != None: - conf.env['build_target'] = 'i386' - elif re.search("powerpc", cpu) != None: - conf.env['build_target'] = 'powerpc' - elif re.search("arm", cpu) != None: - conf.env['build_target'] = 'arm' + match = re.search( + "(?P<cpu>i[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)", + cpu) + if (match): + conf.env['build_target'] = match.group("cpu") + if re.search("i[0-5]86", conf.env['build_target']): + conf.env['build_target'] = "i386" else: - conf.env['build_target'] = 'i686' + conf.env['build_target'] = 'none' else: conf.env['build_target'] = opt.dist_target |