Skip to content

Commit e13a62f

Browse files
committed
Fixing arch i386 issues
1 parent 4f3ae17 commit e13a62f

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

setup.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,16 @@ def _single_compile(obj):
2323
import os
2424
import subprocess
2525
import sys
26+
import re
2627

2728
cflags = sysconfig.get_config_var('CFLAGS')
28-
sysconfig._config_vars['CFLAGS'] = cflags.replace(' -g ', ' ').replace(' -Os ', ' ')
29+
sysconfig._config_vars['CFLAGS'] = re.sub(' +', ' ', cflags.replace('-g', '').replace('-Os', ''))
2930
opt = sysconfig.get_config_var('OPT')
30-
sysconfig._config_vars['OPT'] = opt.replace(' -g ', ' ').replace(' -Os ', ' ')
31+
sysconfig._config_vars['OPT'] = re.sub(' +', ' ', opt.replace('-g', '').replace('-Os', ''))
3132
ldshared = sysconfig.get_config_var('LDSHARED')
32-
sysconfig._config_vars['LDSHARED'] = ldshared.replace(' -g ', ' ').replace(' -Os ', ' ')
33+
sysconfig._config_vars['LDSHARED'] = re.sub(' +', ' ', ldshared.replace('-g', '').replace('-Os', '').replace('-arch i386', ''))
34+
ldflags = sysconfig.get_config_var('LDFLAGS')
35+
sysconfig._config_vars['LDFLAGS'] = re.sub(' +', ' ', ldflags.replace('-g', '').replace('-Os', '').replace('-arch i386', ''))
3336

3437
if os.environ.get("MASON_BUILD", "false") == "true":
3538
# run bootstrap.sh to get mason builds

0 commit comments

Comments
 (0)