diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2014-09-06 12:27:56 +0200 |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2014-09-06 12:27:56 +0200 |
| commit | d9a0133cb767503aed23e4c09e77a2c6e34db25e (patch) | |
| tree | 2cc8c53e7643def57533d9f29be388781da9fd9e | |
| parent | 593d2f4ebbe6df01740dc8e06ef2799454f9bea3 (diff) | |
| download | scons-d9a0133cb767503aed23e4c09e77a2c6e34db25e.tar.gz | |
- additional fixes to get all tests pass on the Fedora20 box
| -rw-r--r-- | src/engine/SCons/Tool/ldc.py | 2 | ||||
| -rw-r--r-- | test/sconsign/script/Configure.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py index 6b215e2f..fa500604 100644 --- a/src/engine/SCons/Tool/ldc.py +++ b/src/engine/SCons/Tool/ldc.py @@ -126,7 +126,7 @@ def generate(env): # platform supports it. env['DRPATHPREFIX'] = '-L-rpath=' env['DRPATHSUFFIX'] = '' - env['_RPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}' + env['_DRPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}' SCons.Tool.createStaticLibBuilder(env) diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py index 3b43defd..679f084a 100644 --- a/test/sconsign/script/Configure.py +++ b/test/sconsign/script/Configure.py @@ -58,9 +58,8 @@ CC_file = re.escape(CC_file) _sconf_temp_conftest_0_c = '.sconf_temp/conftest_0.c' test.write('SConstruct', """ -env = Environment() import os -env.AppendENVPath('PATH', os.environ['PATH']) +env = Environment(ENV={'PATH' : os.environ.get('PATH','')}) conf = Configure(env) r1 = conf.CheckCHeader( 'math.h' ) env = conf.Finish() |