diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-01-15 02:27:16 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-01-15 02:27:16 (GMT) |
| commit | a9f6cd1ccef091f79f52c210a9c4cea89eaf0a40 (patch) | |
| tree | 0053065c5bdddf39438fdd37a6d170c3990bacab /src | |
| parent | c20e4add922d4a2a74853f5a3af41115dd4f884c (diff) | |
| download | SCons-a9f6cd1ccef091f79f52c210a9c4cea89eaf0a40.zip SCons-a9f6cd1ccef091f79f52c210a9c4cea89eaf0a40.tar.gz SCons-a9f6cd1ccef091f79f52c210a9c4cea89eaf0a40.tar.bz2 | |
merge from upstream
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/ar.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/ar.py b/src/engine/SCons/Tool/ar.py index 14910b7..2cd15c8 100644 --- a/src/engine/SCons/Tool/ar.py +++ b/src/engine/SCons/Tool/ar.py @@ -48,11 +48,7 @@ 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' |