Some SCons fixups

cython · Apr 23, 2010 · 62a6348 · 62a6348
1 parent eea6a47
commit 62a6348
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/Tools/site_scons/site_tools/cython.py b/Tools/site_scons/site_tools/cython.py
@@ -41,7 +41,6 @@ def create_builder(env):
     return cython
 
 def cython_suffix_emitter(env, source):
-    print 'emitter called'
     return "$CYTHONCFILESUFFIX"
 
 def generate(env):

diff --git a/Tools/site_scons/site_tools/pyext.py b/Tools/site_scons/site_tools/pyext.py
@@ -178,13 +178,13 @@ def set_configuration(env, use_distutils):
     # We define commands as strings so that we can either execute them using
     # eval (same python for scons and distutils) or by executing them through
     # the shell.
-    dist_cfg = {'PYEXTCC': "sysconfig.get_config_var('CC')", 
+    dist_cfg = {'PYEXTCC': ("sysconfig.get_config_var('CC')", False), 
-                'PYEXTCFLAGS': "sysconfig.get_config_var('CFLAGS')", 
+                'PYEXTCFLAGS': ("sysconfig.get_config_var('CFLAGS')", True), 
-                'PYEXTCCSHARED': "sysconfig.get_config_var('CCSHARED')", 
+                'PYEXTCCSHARED': ("sysconfig.get_config_var('CCSHARED')", False), 
-                'PYEXTLINKFLAGS': "sysconfig.get_config_var('LDFLAGS')", 
+                'PYEXTLINKFLAGS': ("sysconfig.get_config_var('LDFLAGS')", True), 
-                'PYEXTLINK': "sysconfig.get_config_var('LDSHARED')", 
+                'PYEXTLINK': ("sysconfig.get_config_var('LDSHARED')", False), 
-                'PYEXTINCPATH': "sysconfig.get_python_inc()", 
+                'PYEXTINCPATH': ("sysconfig.get_python_inc()", False), 
-                'PYEXTSUFFIX': "sysconfig.get_config_var('SO')"}
+                'PYEXTSUFFIX': ("sysconfig.get_config_var('SO')", False)}
 
     from distutils import sysconfig
 
@@ -193,8 +193,11 @@ def set_configuration(env, use_distutils):
     ifnotset(env, 'PYEXTINCPATH', sysconfig.get_python_inc())
 
     if use_distutils:
-        for k, v in dist_cfg.items():
+        for k, (v, should_split) in dist_cfg.items():
-            ifnotset(env, k, eval(v))
+            val = eval(v)
+            if should_split:
+                val = val.split()
+            ifnotset(env, k, val)
     else:
         _set_configuration_nodistutils(env)