summaryrefslogtreecommitdiffstats
path: root/test/sconsign/script/Configure.py
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2012-10-06 21:52:34 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2012-10-06 21:52:34 (GMT)
commitf79ad697f90ac1bca6671682e7b3d8b292356733 (patch)
treef46369d70ad043a6146d72fd1e0ad139b0fc291a /test/sconsign/script/Configure.py
parenta75755810b08c4d1f6bf7e28211f4a62872b35d8 (diff)
parentaf2b9e2f216459fcdc26f367aaaf528d8122283b (diff)
downloadSCons-f79ad697f90ac1bca6671682e7b3d8b292356733.zip
SCons-f79ad697f90ac1bca6671682e7b3d8b292356733.tar.gz
SCons-f79ad697f90ac1bca6671682e7b3d8b292356733.tar.bz2
Merged in dirkbaechle/scons (pull request #40): fix RPM tests to use new rpmutils
Diffstat (limited to 'test/sconsign/script/Configure.py')
-rw-r--r--test/sconsign/script/Configure.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py
index 865b607..3b43def 100644
--- a/test/sconsign/script/Configure.py
+++ b/test/sconsign/script/Configure.py
@@ -40,7 +40,11 @@ _obj = TestSCons._obj
test = TestSConsign.TestSConsign(match = TestSConsign.match_re,
diff = TestSConsign.diff_re)
-CC = test.detect('CC', norm=1)
+# Note: Here we pass the full search PATH of our current system to
+# the detect() method. This way we try to ensure that we find the same
+# compiler executable as the SConstruct below, which uses
+# os.environ['PATH'] too.
+CC = test.detect('CC', ENV={'PATH' : os.environ.get('PATH','')}, norm=1)
CC_dir, CC_file = os.path.split(CC)
CC = re.escape(CC)