diff options
-rw-r--r-- | src/core/config/windows.pri | 8 | ||||
-rw-r--r-- | src/core/core_module.pro | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 429e4e45f..385faeed0 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -8,9 +8,6 @@ gn_args += \ win_linker_timing=true \ com_init_check_hook_disabled=true -use_lld_linker: gn_args += use_lld=true -else: gn_args += use_lld=false - clang_cl { clang_full_path = $$system_path($$which($${QMAKE_CXX})) # Remove the "\bin\clang-cl.exe" part: @@ -18,10 +15,11 @@ clang_cl { clang_prefix = $$join(clang_dir,,,"\..") gn_args += \ is_clang=true \ + use_ldd=true \ clang_use_chrome_plugins=false \ - clang_base_path=$$system_quote($$system_path($$clean_path($$clang_prefix))) + clang_base_path=\"$$system_path($$clean_path($$clang_prefix))\" } else { - gn_args += is_clang=false + gn_args += is_clang=false use_lld=false } isDeveloperBuild() { diff --git a/src/core/core_module.pro b/src/core/core_module.pro index e2fa3494d..f9f72176f 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -60,7 +60,7 @@ osx { # Remove unused functions and data in debug non-developer builds, because the binaries will # be smaller in the shipped packages. QMAKE_LFLAGS += /OPT:REF - } else:CONFIG(debug, debug|release) { + } else:CONFIG(debug, debug|release):!clang_cl { # Make sure to override qtbase's QMAKE_LFLAGS_DEBUG option in debug developer builds, # because qmake chooses and overrides the option when it gets appended to QMAKE_LFLAGS in # qtbase\mkspecs\features\default_post.prf, regardless of what Chromium passes back from GN. |