Merge pull request #1 from rbrito/force-scons-honor-variables

Force scons honor variables
derat · Feb 29, 2012 · 26d9a09 · 26d9a09
2 parents ae9295f + 1769860
commit 26d9a09
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,6 @@ xsettingsd
 *.[ao]
 *_test
 build-stamp
-debian/
+debian/files
+debian/*.log
+debian/*.substvars
diff --git a/SConstruct b/SConstruct
@@ -1,3 +1,4 @@
+# -*- python -*-
 # Copyright 2009 Daniel Erat <dan@erat.org>
 # All rights reserved.
 
@@ -38,9 +39,14 @@ run_tests_builder = Builder(action=run_tests)
 env = Environment(
     BUILDERS = {
       'RunTests': run_tests_builder,
-    },
-    ENV=os.environ)
-env['CCFLAGS'] = '-Wall -Werror'
+    })
+
+env.Append(CPPFLAGS = os.environ['CPPFLAGS'],
+           CCFLAGS = os.environ['CCFLAGS'],
+           CXXFLAGS = os.environ['CXXFLAGS'],
+           LDFLAGS = os.environ['LDFLAGS'])
+
+env.Append(CCFLAGS = '-Wall -Werror')
 
 
 srcs = Split('''\