diff options
author | William Deegan <bill@baddogconsulting.com> | 2016-11-28 16:53:37 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2016-11-28 16:53:37 (GMT) |
commit | 694e80ea463c655d2e011afd4fe35109c119d6e7 (patch) | |
tree | 566428089b48f80bab14789ec4e3d77b8d003477 /src/engine/SCons/Tool/ar.py | |
parent | 1c19e9f962b8cab0f9086615bb6409f8a326c0b8 (diff) | |
download | SCons-694e80ea463c655d2e011afd4fe35109c119d6e7.zip SCons-694e80ea463c655d2e011afd4fe35109c119d6e7.tar.gz SCons-694e80ea463c655d2e011afd4fe35109c119d6e7.tar.bz2 |
Fix tests failing on win32 AR and Fortran and M4
Diffstat (limited to 'src/engine/SCons/Tool/ar.py')
-rw-r--r-- | src/engine/SCons/Tool/ar.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/ar.py b/src/engine/SCons/Tool/ar.py index 0c3ac09..2cd15c8 100644 --- a/src/engine/SCons/Tool/ar.py +++ b/src/engine/SCons/Tool/ar.py @@ -48,8 +48,8 @@ def generate(env): env['LIBPREFIX'] = 'lib' env['LIBSUFFIX'] = '.a' - if env.Detect('ranlib'): - env['RANLIB'] = 'ranlib' + if env.get('RANLIB',env.Detect('ranlib')) : + env['RANLIB'] = env.get('RANLIB','ranlib') env['RANLIBFLAGS'] = SCons.Util.CLVar('') env['RANLIBCOM'] = '$RANLIB $RANLIBFLAGS $TARGET' |