Swiftdiff options
| -rw-r--r-- | BuildTools/SCons/Tools/Test.py | 2 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/BuildTools/SCons/Tools/Test.py b/BuildTools/SCons/Tools/Test.py index e609a04..ebf9dc6 100644 --- a/BuildTools/SCons/Tools/Test.py +++ b/BuildTools/SCons/Tools/Test.py @@ -21,3 +21,3 @@ def generate(env) : test_env = env.Clone() - for i in ["HOME", "USERPROFILE", "APPDATA", "ASAN_OPTIONS", "LSAN_OPTIONS", "SWIFT_NETWORK_TEST_IPV4", "SWIFT_NETWORK_TEST_IPV6"]: + for i in ["HOME", "PATH", "USERPROFILE", "APPDATA", "ASAN_OPTIONS", "LSAN_OPTIONS", "SWIFT_NETWORK_TEST_IPV4", "SWIFT_NETWORK_TEST_IPV6"]: if os.environ.get(i, "") : diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 3ce2057..ff97b42 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -78,7 +78,6 @@ testQtEnv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"]) testQtEnv.EnableQt4Modules(qt4modules, debug = False, version = qt_version) -env["SWIFT_QTUI_TEST_FLAGS"] = { - "CPPFLAGS": testQtEnv["CPPFLAGS"], - "LIBS": testQtEnv["LIBS"], - "LINKFLAGS": testQtEnv["LINKFLAGS"], -} +env["SWIFT_QTUI_TEST_FLAGS"] = {} +for key in ["CCFLAGS", "CPPFLAGS", "CPPPATH", "CPPDEFINES", "LIBS", "LINKFLAGS", "LIBPATH"] : + if key in testQtEnv: + env["SWIFT_QTUI_TEST_FLAGS"][key] = testQtEnv[key] |