Commit 999f6311 authored by Kai Koehne's avatar Kai Koehne
Browse files

Fix build on 32 bit msvc toolchain

Bring back the logic to disable debugging symbols for 32
bit native compilers on Windows (symbol_level = 0), or
only do minimal debugging symbols useful for e.g. stack
traces (symbol_level = 1).

The corresponding gyp logic got removed in commit c5282c34

.

Change-Id: Ibb7d43814992a00f5413d024f9c362d41dc5a3a5
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@qt.io>
Showing with 27 additions and 0 deletions
......@@ -19,6 +19,33 @@ isDeveloperBuild() {
use_incremental_linking=false
}
defineTest(usingMSVC32BitCrossCompiler) {
CL_DIR =
for(dir, QMAKE_PATH_ENV) {
exists($$dir/cl.exe) {
CL_DIR = $$dir
break()
}
}
isEmpty(CL_DIR): {
warning(Cannot determine location of cl.exe.)
return(false)
}
CL_DIR = $$system_path($$CL_DIR)
CL_DIR = $$split(CL_DIR, \\)
CL_PLATFORM = $$last(CL_DIR)
equals(CL_PLATFORM, amd64_x86): return(true)
return(false)
}
msvc:contains(QT_ARCH, "i386"):!usingMSVC32BitCrossCompiler() {
# The 32 bit MSVC linker runs out of memory if we do not remove all debug information.
gn_args += symbol_level=0
} else {
# Chromium builds with debug info in release by default but Qt doesn't
CONFIG(release, debug|release):!force_debug_info: gn_args += symbol_level=1
}
msvc {
equals(MSVC_VER, 14.0) {
MSVS_VERSION = 2015
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment