Author: soliton
Date: Mon Jun 2 23:58:36 2008
New Revision: 26984
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26984&view=rev
Log:
* append CXXFLAGS and LDFLAGS later so you can actually override stuff with them
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=26984&r1=26983&r2=26984&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Mon Jun 2 23:58:36 2008
@@ -263,12 +263,6 @@
for d in installdirs:
env[d] = os.path.join("/", env["destdir"], env[d].lstrip("/"))
-if 'CXXFLAGS' in os.environ:
- env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
-
-if 'LDFLAGS' in os.environ:
- env.Append(LINKFLAGS = os.environ['LDFLAGS'])
-
test_env = env.Clone()
if boost_test_dyn_link:
test_env.Append(CPPDEFINES = "BOOST_TEST_DYN_LINK")
@@ -302,6 +296,12 @@
build = env["build"]
env.AppendUnique(CXXFLAGS = builds[build])
if build == "profile": env.AppendUnique(LINKFLAGS = "-pg")
+if 'CXXFLAGS' in os.environ:
+ env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
+
+if 'LDFLAGS' in os.environ:
+ env.Append(LINKFLAGS = os.environ['LDFLAGS'])
+
env.MergeFlags(env["extra_flags_" + build])
SConscript("src/SConscript", build_dir = os.path.join("build", build), exports
= "env")
Import(binaries + ["sources"])
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
