From fe16533afb684f6f9f64c8bff1b3af572c02cdf7 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 5 Nov 2018 18:47:44 -0500 Subject: Fix Java/multi-step.py to avoid picking up cygwin or mingw's link.exe which takes different arguments than the expected msvc --- test/Java/multi-step.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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',[])) -- cgit v0.12