diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-11-05 23:47:44 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-11-05 23:47:44 (GMT) |
| commit | fe16533afb684f6f9f64c8bff1b3af572c02cdf7 (patch) | |
| tree | b25644dbfd5701ea6396b12e85fbec0aec48f837 /test/Java | |
| parent | d10f3da341d937bce176629ca882bcebd2235a46 (diff) | |
| download | SCons-fe16533afb684f6f9f64c8bff1b3af572c02cdf7.zip SCons-fe16533afb684f6f9f64c8bff1b3af572c02cdf7.tar.gz SCons-fe16533afb684f6f9f64c8bff1b3af572c02cdf7.tar.bz2 | |
Fix Java/multi-step.py to avoid picking up cygwin or mingw's link.exe which takes different arguments than the expected msvc
Diffstat (limited to 'test/Java')
| -rw-r--r-- | test/Java/multi-step.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py index 33e2a5f..2e2ff56 100644 --- a/test/Java/multi-step.py +++ b/test/Java/multi-step.py @@ -72,7 +72,14 @@ test.subdir(['src'], test.write(['SConstruct'], """\ import os,sys -env=Environment(tools = ['default', 'javac', 'javah', 'swig'], + +if sys.platform == 'win32': + # Ensure tests don't pick up link from mingw or cygwin + tools = ['msvc', 'mslink', 'jar', 'javac', 'javah', 'swig'] +else: + tools = ['default', 'javac', 'javah', 'swig'] + +env=Environment(tools = tools, CPPPATH=["$JAVAINCLUDES"]) Export('env') env.PrependENVPath('PATH',os.environ.get('PATH',[])) |