diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-22 08:30:41 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-22 09:24:18 +0000 |
| commit | 6b8d0eca48e18394cb1075d3e7ace326a398742e (patch) | |
| tree | a64d97d4a954b8c9c419c479e6257e073c8923d1 | |
| parent | 77de5fb2d02551eb7563ba1a42c74ad6581815fb (diff) | |
coin_build/test_instructions.py: Remove environment variables impacting cmake
Remove CC,CXX which might be set by some COIN setup scripts.
Change-Id: I33d56dfeb54476edf591fc765a4a4c3c8fe746a6
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | coin_build_instructions.py | 5 | ||||
| -rw-r--r-- | coin_test_instructions.py | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index db021470f..5c12415dd 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -128,6 +128,11 @@ def run_build_instructions(): if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER): exit() + # Remove some environment variables that impact cmake + for env_var in ['CC', 'CXX']: + if os.environ.get(env_var): + del os.environ[env_var] + # Uses default python, hopefully we have python2 installed on all hosts # Skip building using Python 2 on Windows, because of different MSVC C runtimes (VS2008 vs VS2015+) if CI_HOST_OS != "Windows": diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 4121bb558..7fbe540b4 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -87,6 +87,11 @@ def run_test_instructions(): if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER): exit() + # Remove some environment variables that impact cmake + for env_var in ['CC', 'CXX']: + if os.environ.get(env_var): + del os.environ[env_var] + os.chdir(CI_ENV_AGENT_DIR) testRun = 0 # We didn't build for Python 2 in win |