diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-08 14:54:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-08 19:17:56 +0100 |
| commit | 7fcf5d83d7035fdcdf9d60670cd0bce64ae32e64 (patch) | |
| tree | 2079692682df338b174e6c2dea33925ab0ca2bd7 /build_scripts/main.py | |
| parent | 9ef643830072c5138c459f79127df33ecbb56ecc (diff) | |
build_system: Remove code trying to find the MSVC installation
The code was not triggered since the build system tries to compile
a small test project with Ninja before even reaching it.
It was also using code for MSVC 9 (2008) which does not work anymore
and causes deprecation warnings:
setuptools\_distutils\msvc9compiler.py:34: DeprecationWarning:
msvc9compiler is deprecated and slated to be removed in the future.
Please discontinue use or file an issue with pypa/distutils describing
your use case.
Change-Id: I95a6b7700c13873884deb6186e78d6c520c592de
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Diffstat (limited to 'build_scripts/main.py')
| -rw-r--r-- | build_scripts/main.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 2fc66dfd6..c12d2101f 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -39,7 +39,7 @@ from .platforms.unix import prepare_packages_posix from .platforms.windows_desktop import prepare_packages_win32 from .qtinfo import QtInfo from .utils import (copydir, copyfile, detect_clang, filter_match, - get_numpy_location, get_python_dict, init_msvc_env, + get_numpy_location, get_python_dict, linux_fix_rpaths_for_library, macos_fix_rpaths_for_library, platform_cmake_options, remove_tree, run_process, run_process_output, update_env_path, which) @@ -78,18 +78,14 @@ def _get_make(platform_arch, build_type): if makespec == "make": return ("make", "Unix Makefiles") if makespec == "msvc": - nmake_path = Path(which("nmake")) - if nmake_path is None or not nmake_path.exists(): - log.info("nmake not found. Trying to initialize the MSVC env...") - init_msvc_env(platform_arch, build_type) - nmake_path = Path(which("nmake")) - if not nmake_path or not nmake_path.exists(): - raise SetupError('"nmake" could not be found.') if not OPTION["NO_JOM"]: jom_path = Path(which("jom")) if jom_path: log.info(f"jom was found in {jom_path}") return (jom_path, "NMake Makefiles JOM") + nmake_path = Path(which("nmake")) + if nmake_path is None or not nmake_path.exists(): + raise SetupError("nmake not found") log.info(f"nmake was found in {nmake_path}") if OPTION["JOBS"]: msg = "Option --jobs can only be used with 'jom' on Windows." |