diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-20 10:45:28 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-20 09:42:55 +0000 |
| commit | f95d002dc0332cef67546e7b3ff04fafcf4130c5 (patch) | |
| tree | 33b506caf1cca5f59136ea697d234b737aba202f | |
| parent | bfc7f380a0867044a1642181f2dc002ab88376c9 (diff) | |
Revert "setup.py: parallel build by default"
The default is not compatible with certain Linux accelerations.
This reverts commit 99bfe460b85ccb3562e10f12972852233870e649.
Change-Id: I8b6a2854adc40d6b9949a8d92f0b521a94940ba4
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | build_scripts/main.py | 6 | ||||
| -rw-r--r-- | build_scripts/utils.py | 7 |
2 files changed, 1 insertions, 12 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 03e4259d4..b64d6f1a9 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -133,7 +133,6 @@ from setuptools.command.build_py import build_py as _build_py from .qtinfo import QtInfo from .utils import rmtree, detect_clang, copyfile, copydir, run_process_output, run_process from .utils import update_env_path, init_msvc_env, filter_match, macos_fix_rpaths_for_library -from .utils import cpu_count from .platforms.unix import prepare_packages_posix from .platforms.windows_desktop import prepare_packages_win32 from .wheel_override import wheel_module_exists, get_bdist_wheel_override @@ -229,10 +228,7 @@ if OPTION_JOBS: if not OPTION_JOBS.startswith('-j'): OPTION_JOBS = '-j' + OPTION_JOBS else: - if sys.platform == 'win32' and OPTION_NO_JOM: - OPTION_JOBS = '' - else: - OPTION_JOBS = '-j' + str(cpu_count()) + OPTION_JOBS = '' def is_debug_python(): return getattr(sys, "gettotalrefcount", None) is not None diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 1b941aea9..7160630d1 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1124,10 +1124,3 @@ def acceptCITestConfiguration(hostOS, hostOSVer, targetArch, compiler): print("Disabled " + compiler + " to " + targetArch + " from Coin configuration") return False return True - -def cpu_count(): - try: - import multiprocessing - return multiprocessing.cpu_count() - except (ImportError, NotImplementedError, AttributeError): - return 1 |