diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-29 10:46:25 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-29 10:46:28 +0200 |
| commit | 5dc72386fb6dd90d8eb75ea04ef9d318ecf62bd2 (patch) | |
| tree | f175bba8d1d097158783e35b6e5f76b4be6cb913 /coin_build_instructions.py | |
| parent | a1a8cf65b7426d9466f6340cfeb162f2d0787de2 (diff) | |
| parent | 8d5e491eaeb3188154135a6ef8e9400983c4bafa (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: I4b6ef2bcc91c46b3084f9797c1bbfaddc4367941
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("") |