diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-29 12:27:13 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-29 12:27:15 +0200 |
| commit | b8b516d00a096f44a6703d77d0219b27523b4f93 (patch) | |
| tree | 26b99e447136fe37b18d8457a68608d8562ecbf7 /coin_build_instructions.py | |
| parent | 7beb2809397bd49809a3e4032195f93315d8422e (diff) | |
| parent | 5dc72386fb6dd90d8eb75ea04ef9d318ecf62bd2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I2099b742b0c74c61deb019a64508fcfe8382e0fb
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 175513570..ad4331845 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -89,6 +89,14 @@ def call_setup(python_ver): run_instruction(cmd, "Failed to run setup.py") def run_build_instructions(): + # Disable unsupported configs for now + if CI_HOST_OS_VER in ["WinRT_10"]: + print("Disabled " + CI_HOST_OS_VER + " from Coin configuration") + 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 call_setup("") |