diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-11-28 16:55:20 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-11-28 16:55:20 (GMT) |
| commit | a36be0b33a054ae22e61851134090c65fa74e0b1 (patch) | |
| tree | ed6fe9edbfe843fb968ab9e7e8ea395da1682795 /src | |
| parent | e107f8277992751680db0eb7b70e38ea260790fc (diff) | |
| parent | 694e80ea463c655d2e011afd4fe35109c119d6e7 (diff) | |
| download | SCons-a36be0b33a054ae22e61851134090c65fa74e0b1.zip SCons-a36be0b33a054ae22e61851134090c65fa74e0b1.tar.gz SCons-a36be0b33a054ae22e61851134090c65fa74e0b1.tar.bz2 | |
merge heads
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/ar.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index cc5a508..0e5f364 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -263,7 +263,7 @@ def createStaticLibBuilder(env): static_lib = env['BUILDERS']['StaticLibrary'] except KeyError: action_list = [ SCons.Action.Action("$ARCOM", "$ARCOMSTR") ] - if env.Detect('ranlib'): + if env.get('RANLIB',False) or env.Detect('ranlib'): ranlib_action = SCons.Action.Action("$RANLIBCOM", "$RANLIBCOMSTR") action_list.append(ranlib_action) 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' diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index 948ebe5..778db3c 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -86,7 +86,8 @@ def shlib_emitter(target, source, env): no_import_lib = env.get('no_import_lib', 0) if not dll: - raise SCons.Errors.UserError("A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX")) + raise SCons.Errors.UserError("A shared library should have exactly one target with the suffix: %s Target(s) are:%s" % \ + (env.subst("$SHLIBSUFFIX"), ",".join([str(t) for t in target]))) if not no_import_lib and \ not env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX'): |