boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-21 05:02:17 +00:00
Code Issues Projects Releases Wiki Activity

Change how external environment variables are propagated to SCons to allow it to find executables in $PATH.

Browse Source
This commit is contained in:
Jim Bosch
2012-04-21 15:14:29 -04:00
parent 99e6194620
commit 46f6382fe4
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SConscript
View File

@@ -193,15 +193,11 @@ def setupOptions():
return variables
def makeEnvironment(variables):
env = Environment(variables=variables)
if os.environ.has_key("PATH"):
env["ENV"]["PATH"] = os.environ["PATH"]
if os.environ.has_key("LD_LIBRARY_PATH"):
env["ENV"]["LD_LIBRARY_PATH"] = os.environ["LD_LIBRARY_PATH"]
if os.environ.has_key("DYLD_LIBRARY_PATH"):
env["ENV"]["DYLD_LIBRARY_PATH"] = os.environ["DYLD_LIBRARY_PATH"]
if os.environ.has_key("PYTHONPATH"):
env["ENV"]["PYTHONPATH"] = os.environ["PYTHONPATH"]
shellEnv = {}
for key in ("PATH", "LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH", "PYTHONPATH"):
if key in os.environ:
shellEnv[key] = os.environ[key]
env = Environment(variables=variables, ENV=shellEnv)
if os.environ.has_key("CCFLAGS"):
env.AppendUnique(CCFLAGS = os.environ["CCFLAGS"])
custom_rpath = GetOption("custom_rpath")