diff options
| author | Steven Knight <knight@baldmt.com> | 2003-01-30 15:21:58 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-01-30 15:21:58 (GMT) |
| commit | 8c857d116b57450227a1fe4bc822d8b2e5047f54 (patch) | |
| tree | f56c695df46a5aa6e1e329a30511b7ee6f054d90 /test/scan-once.py | |
| parent | 286d4a73c144735959428265a26a27ec8f46dae5 (diff) | |
| download | SCons-8c857d116b57450227a1fe4bc822d8b2e5047f54.zip SCons-8c857d116b57450227a1fe4bc822d8b2e5047f54.tar.gz SCons-8c857d116b57450227a1fe4bc822d8b2e5047f54.tar.bz2 | |
Win32 portability.
Diffstat (limited to 'test/scan-once.py')
| -rw-r--r-- | test/scan-once.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/scan-once.py b/test/scan-once.py index 35bb2d7..4355998 100644 --- a/test/scan-once.py +++ b/test/scan-once.py @@ -287,6 +287,12 @@ env = env.Copy() # Yes, clobber intentionally Mylib.AddCFlags(env, "-DGOOFY_DEMO") Mylib.AddIncludeDirs(env, ".") +# Not part of SLF's original stuff: On Win32, it's import to use the +# original test environment when we invoke SCons recursively. +import os +recurse_env = env.Copy() +recurse_env["ENV"] = os.environ + # Icky code to set up process environment for "make" # I really ought to drop this into Mylib.... @@ -336,9 +342,9 @@ cmd_justlib = "%s %s -C %s" % (sys.executable, sys.argv[0], Dir(".")) env.Command(string.split(generated_hdrs), ["MAKE-HEADER.py"], cmd_generated) -env.Command([lib_fullname] + lib_objs, - lib_srcs + string.split(generated_hdrs + " " + static_hdrs), - cmd_justlib) +recurse_env.Command([lib_fullname] + lib_objs, + lib_srcs + string.split(generated_hdrs + " " + static_hdrs), + cmd_justlib) """) test.write(['SLF', 'src', 'lib_geng', 'MAKE-HEADER.py'], """\ |