diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:20:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:21:33 +0100 |
| commit | d140f2f61499f424983582770af8c28399a373c1 (patch) | |
| tree | b05dc03863502293083ded9d61fc344ab5a9da7b /mkspecs | |
| parent | bf131e8d2181b3404f5293546ed390999f760404 (diff) | |
| parent | 8ffb200153d1b1a8402c875c4961160efb149201 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
examples/widgets/widgets/scribble/mainwindow.cpp
This amends cb54c16584cf3be746a1a536c1e37cb3022a2f1b.
Change-Id: Iaae60a893330524b2973917e23b31f9d51f8bd38
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/clang-mac.conf | 1 | ||||
| -rw-r--r-- | mkspecs/features/ltcg.prf | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf index cbae2e6262..143406308c 100644 --- a/mkspecs/common/clang-mac.conf +++ b/mkspecs/common/clang-mac.conf @@ -5,6 +5,7 @@ QMAKE_OBJCXXFLAGS_PRECOMPILE = -x objective-c++-header -c ${QMAKE_PCH_INPUT} QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0 +QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO = -Wl,-object_path_lto,${OBJECTS_DIR}/${TARGET}_lto.o QMAKE_CXXFLAGS += -stdlib=libc++ QMAKE_LFLAGS += -stdlib=libc++ diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf index 10d14dfe85..d81f340edd 100644 --- a/mkspecs/features/ltcg.prf +++ b/mkspecs/features/ltcg.prf @@ -1,6 +1,12 @@ static:no-static-ltcg { # Static library but no-static-ltcg enabled: skip LTCG } else: CONFIG(release, debug|release) { + separate_debug_info { + # Evaluate single-$ variable references that have no valid value at mkspec loading time + QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO ~= s/\\$\\{/\$\$\{/ + eval(QMAKE_LFLAGS_LTCG += $$QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO) + } + # We need fat object files when creating static libraries on some platforms # so the linker will know to load a particular object from the library # in the first place. On others, we have special ar and nm to create the symbol |