diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-01-15 02:12:56 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-01-15 02:12:56 (GMT) |
| commit | c20e4add922d4a2a74853f5a3af41115dd4f884c (patch) | |
| tree | b8590cbb243392ede922d803a4ef5748ebd1b97f /src | |
| parent | 8c6e0083ca86b6ea3c778361a79d8ffaeb2fd563 (diff) | |
| download | SCons-c20e4add922d4a2a74853f5a3af41115dd4f884c.zip SCons-c20e4add922d4a2a74853f5a3af41115dd4f884c.tar.gz SCons-c20e4add922d4a2a74853f5a3af41115dd4f884c.tar.bz2 | |
merged from upstream
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/ar.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/engine/SCons/Tool/ar.py b/src/engine/SCons/Tool/ar.py index 2cd15c8..14910b7 100644 --- a/src/engine/SCons/Tool/ar.py +++ b/src/engine/SCons/Tool/ar.py @@ -48,7 +48,11 @@ def generate(env): env['LIBPREFIX'] = 'lib' env['LIBSUFFIX'] = '.a' +<<<<<<< working copy + if env.get('RANLIB',False) or env.Detect('ranlib'): +======= if env.get('RANLIB',env.Detect('ranlib')) : +>>>>>>> merge rev env['RANLIB'] = env.get('RANLIB','ranlib') env['RANLIBFLAGS'] = SCons.Util.CLVar('') env['RANLIBCOM'] = '$RANLIB $RANLIBFLAGS $TARGET' |