diff --git a/SConstruct b/SConstruct index 10e12db..294e7f8 100644 --- a/SConstruct +++ b/SConstruct @@ -254,8 +254,9 @@ env['PYTHON'] = sys.executable # settings. env['STRIP'] = "strip" env['PKG_CONFIG'] = "pkg-config" +env['PYTHON_CONFIG'] = "python-config" env['CHRPATH'] = 'chrpath' -for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "LINKFLAGS", "STRIP", "PKG_CONFIG", "CHRPATH", "LD", "TAR"]: +for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "LINKFLAGS", "STRIP", "PKG_CONFIG", "CHRPATH", "LD", "TAR", "PYTHON_CONFIG"]: if os.environ.has_key(i): j = i if i == "LD": @@ -1115,6 +1116,7 @@ else: python_env = env.Clone() vars = sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS') + libs = _getoutput(env['PYTHON_CONFIG'] + ' --libs').split() for i in range(len(vars)): if vars[i] is None: vars[i] = [] @@ -1145,7 +1147,8 @@ else: CPPPATH=[includepy], CPPFLAGS=opt, CFLAGS=basecflags, - CXXFLAGS=basecflags) + CXXFLAGS=basecflags, + LIBS=libs) python_objects={} python_compiled_libs = {}