diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-01-15 02:19:49 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-01-15 02:19:49 (GMT) |
| commit | 7b514fb2f9cf65c0fcc6b719d788a20fbad6104f (patch) | |
| tree | 84aa160fc307994e7be8d697901e4ee46c857648 /src/engine | |
| parent | b428a201ac880a80a5ba66b01f1bfe88435b509c (diff) | |
| download | SCons-7b514fb2f9cf65c0fcc6b719d788a20fbad6104f.zip SCons-7b514fb2f9cf65c0fcc6b719d788a20fbad6104f.tar.gz SCons-7b514fb2f9cf65c0fcc6b719d788a20fbad6104f.tar.bz2 | |
Fix merge errors
Diffstat (limited to 'src/engine')
| -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' |