mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-11 19:04:05 +02:00
Code Issues Projects Releases Wiki Activity

Fix copying multiple CFLAGS/CCFLAGS from environment in Sconscript

Browse Source
This commit is contained in:
jacksonmj
2014-04-15 21:28:19 +01:00
parent ba850ade83
commit 4b52209933
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SConscript
View File

@@ -10,6 +10,8 @@
# requirements # requirements
# ============ # ============
import SCons.Util
# stdlib # stdlib
# ====== # ======
@@ -142,12 +144,16 @@ else:
env = Environment(tools = ['default'], ENV = os.environ) env = Environment(tools = ['default'], ENV = os.environ)
if(GetOption("copy_env")): if(GetOption("copy_env")):
lstvar=["CC","CXX","LD","CFLAGS","CCFLAGS","LIBPATH"] singlevar=["CC","CXX","LD","LIBPATH"]
print "WARNING: enviroment copying enabled. changes in the enviroment can easily break the build process." multivar=["CFLAGS","CCFLAGS","LINKFLAGS"] # variables containing several space separated things
for var in lstvar: for var in singlevar:
if var in os.environ: if var in os.environ:
env[var] = os.environ[var] env[var] = os.environ[var]
print "WARNING: copying enviroment variable {}={!r}".format(var,os.environ[var]) print "WARNING: copying enviroment variable {}={!r}".format(var,os.environ[var])
for var in multivar:
if var in os.environ:
env[var] += SCons.Util.CLVar(os.environ[var])
print "WARNING: copying enviroment variable {}={!r}".format(var,os.environ[var])
# macosx specific platform settings # macosx specific platform settings
# +++++++++++++++++++++++++++++++++ # +++++++++++++++++++++++++++++++++