diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-07 11:17:32 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-07 11:17:37 +0200 |
| commit | 60a3b6a16304af4b1d8896a06b8407fe49f80ed2 (patch) | |
| tree | 6dca986c5e439c7cb39b17643129dadb436d2fea /build_scripts | |
| parent | 33943b54e9470dc8830e94270e6521524acb2954 (diff) | |
| parent | 823eea34b77ca16a545a75b55619a5ed4da38c0e (diff) | |
Merge branch '5.9' into 5.11
Change-Id: I2de0fe8456fca242c56ea28520126f9ebbf540d8
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/main.py | 3 | ||||
| -rw-r--r-- | build_scripts/wheel_override.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index f288756c1..dca373401 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -499,6 +499,9 @@ class PysideBuild(_build): log.info("nmake was found in {}".format(nmake_path)) make_name = "nmake" make_generator = "NMake Makefiles" + if OPTION_JOBS: + msg = "Option --jobs can only be used with 'jom' on Windows." + raise DistutilsSetupError(msg) elif OPTION_MAKESPEC == "mingw": make_name = "mingw32-make" make_generator = "MinGW Makefiles" diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py index ee8bd8382..f6eaedf1c 100644 --- a/build_scripts/wheel_override.py +++ b/build_scripts/wheel_override.py @@ -195,6 +195,6 @@ if wheel_module_exists: # create a properly named package. limited_api_enabled = OPTION_LIMITED_API and sys.version_info[0] >= 3 if limited_api_enabled: - self.py_limited_api = "cp35.cp36.cp37.cp38" + self.py_limited_api = "cp35.cp36" _bdist_wheel.finalize_options(self) |