aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2018-10-18 14:52:28 +0300
committerSimo Fält <simo.falt@qt.io>2018-10-19 13:54:50 +0000
commitee4a3c9259258007e540eac505cdc9b5d38fdaac (patch)
tree10b1c013eaa9bbbdbe0c06082a8db65b9170cfeb
parent3da308ae82229b6326cc8ac707c24a6e828b9090 (diff)
CI: Enable 32 bit windows build
It was enabled alreadyd with 5.11, but got lost at some point. Change-Id: I19b2392889ced75aa6c08c2fd771eed84ffe18a5 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--coin_build_instructions.py4
-rw-r--r--coin_test_instructions.py4
2 files changed, 0 insertions, 8 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index 1104e996c..75f9feb66 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -143,10 +143,6 @@ def run_build_instructions():
if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER):
exit()
- if CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86":
- print("Disabled 32 bit build on 64 bit from Coin configuration, until toolchains provisioned")
- exit()
-
# 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 a61a1c9fa..4121bb558 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -87,10 +87,6 @@ def run_test_instructions():
if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER):
exit()
- if CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86":
- print("Disabled 32 bit build on 64 bit from Coin configuration, until toolchains provisioned")
- exit()
-
os.chdir(CI_ENV_AGENT_DIR)
testRun = 0
# We didn't build for Python 2 in win