diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-09-28 12:18:58 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-09-28 12:18:58 +0200 |
| commit | baee03c569c91b745a1e025660b19a718db16e7d (patch) | |
| tree | 1aaa25835bd24c5c95649cd8ab34d97bafded599 /src/engine/SCons/Tool/ar.py | |
| parent | 4c7fed99e5554ba71d62987c0ec5f1302011b122 (diff) | |
New upstream version 3.0.0upstream/3.0.0
Diffstat (limited to 'src/engine/SCons/Tool/ar.py')
| -rw-r--r-- | src/engine/SCons/Tool/ar.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/ar.py b/src/engine/SCons/Tool/ar.py index dcaafdc..4d2a005 100644 --- a/src/engine/SCons/Tool/ar.py +++ b/src/engine/SCons/Tool/ar.py @@ -9,7 +9,7 @@ selection method. """ # -# Copyright (c) 2001 - 2016 The SCons Foundation +# Copyright (c) 2001 - 2017 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/ar.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" +__revision__ = "src/engine/SCons/Tool/ar.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" import SCons.Defaults import SCons.Tool @@ -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' |