diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-09-24 01:00:54 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-09-24 01:00:54 (GMT) |
| commit | 6da2e3926185a44c20bbd3be3564b332e98afd65 (patch) | |
| tree | 36f98759e145a48243d408d4e9946aa5a3b1c7ad | |
| parent | 9d8ca555d5e95fde61fc3f43fa0fde632e487279 (diff) | |
| download | SCons-6da2e3926185a44c20bbd3be3564b332e98afd65.zip SCons-6da2e3926185a44c20bbd3be3564b332e98afd65.tar.gz SCons-6da2e3926185a44c20bbd3be3564b332e98afd65.tar.bz2 | |
fix test so it should run on any platform
| -rw-r--r-- | src/engine/SCons/Defaults.py | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/applelink.py | 3 | ||||
| -rw-r--r-- | test/LINK/applelink.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index 69d5c94..87e831d 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -342,6 +342,7 @@ Touch = ActionFactory(touch_func, # Internal utility functions + def _concat(prefix, list, suffix, env, f=lambda x: x, target=None, source=None): """ Creates a new list from 'list' by first interpolating each element @@ -358,6 +359,7 @@ def _concat(prefix, list, suffix, env, f=lambda x: x, target=None, source=None): return _concat_ixes(prefix, list, suffix, env) + def _concat_ixes(prefix, list, suffix, env): """ Creates a new list from 'list' by concatenating the 'prefix' and @@ -395,6 +397,7 @@ def _concat_ixes(prefix, list, suffix, env): return result + def _stripixes(prefix, itms, suffix, stripprefixes, stripsuffixes, env, c=None): """ This is a wrapper around _concat()/_concat_ixes() that checks for diff --git a/src/engine/SCons/Tool/applelink.py b/src/engine/SCons/Tool/applelink.py index 65b569a..5a06f9c 100644 --- a/src/engine/SCons/Tool/applelink.py +++ b/src/engine/SCons/Tool/applelink.py @@ -39,6 +39,7 @@ import SCons.Util # the -rpath option, so we use the "link" tool instead of "gnulink". from . import link + def generate(env): """Add Builders and construction variables for applelink to an Environment.""" @@ -68,8 +69,6 @@ def generate(env): env['LDMODULEFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -bundle') env['LDMODULECOM'] = '$LDMODULE -o ${TARGET} $LDMODULEFLAGS $SOURCES $_LIBDIRFLAGS $_LIBFLAGS $_FRAMEWORKPATH $_FRAMEWORKS $FRAMEWORKSFLAGS' - - def exists(env): return env['PLATFORM'] == 'darwin' diff --git a/test/LINK/applelink.py b/test/LINK/applelink.py index 0d05d65..b13b36f 100644 --- a/test/LINK/applelink.py +++ b/test/LINK/applelink.py @@ -49,7 +49,7 @@ main(int argc, char *argv[]) # Test issue # 2580 test.write('SConstruct', """ DefaultEnvironment(tools=[]) -env = Environment() +env = Environment(PLATFORM='darwin') env.Object( target = '#foo.o', |