diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-08 13:08:55 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-08 13:08:55 +0200 |
commit | 12756772e3971f9b832435b1221aef4e32d6970a (patch) | |
tree | 4c7110f9d3f470d3f7970a4efd22a99c4878bf60 /coin_build_instructions.py | |
parent | f2ebeb1546702f26bde8c296794852871d3aa25a (diff) | |
parent | ff8b698d3547b39ba20c97a4c68881a4a789b211 (diff) |
Merge branch '5.9' into 5.11
Change-Id: I7e55b4f27f77e2333b9e0f4cddc8de4b89b6043b
Diffstat (limited to 'coin_build_instructions.py')
-rw-r--r-- | coin_build_instructions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 82841a320..65e198be4 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -126,7 +126,9 @@ def run_build_instructions(): exit() # Uses default python, hopefully we have python2 installed on all hosts - call_setup("") + # Skip building using Python 2 on Windows, because of different MSVC C runtimes (VS2008 vs VS2015+) + if CI_HOST_OS != "Windows": + call_setup("") # In case of packaging build, we have to build also python3 wheel if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]: |