diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-09-12 07:29:45 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-09-12 07:29:45 +0300 |
| commit | 48db16b9459a80442b568024d3a0debb07913e61 (patch) | |
| tree | b9107d29d202733f190e13e1c444adcddf6f76df /cmake/Functions.cmake | |
| parent | 000ac815698c95de530f1cd96f13dd1032a7d1e8 (diff) | |
| parent | 415dccbe8a3667ef8543c764dde6ee49ac67b132 (diff) | |
Merge tag 'v6.2.13-lts' into 6.2.136.2.13
Qt 6.2.13-lts release
Conflicts solved:
dependencies.yaml
src/core/web_engine_context.cpp
Change-Id: Iaf78a1877accff319b335bbb27198b242e12798a
Diffstat (limited to 'cmake/Functions.cmake')
| -rw-r--r-- | cmake/Functions.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index f8bcf9a9a..02e984ebd 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -1189,6 +1189,15 @@ function(add_gn_build_aritfacts_to_target cmakeTarget ninjaTarget module buildDi endforeach() list(GET archs 0 arch) set(target ${ninjaTarget}_${config}_${arch}) + # Work around for broken builds with new Apple linker ld_prime. Force + # use of the classic linker until this has been fixed. + # TODO: remove once this has been fixed by Apple. See issue FB13667242 + # or QTBUG-122655 for details. + if(APPLECLANG) + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0.0") + target_link_options(${cmakeTarget} PRIVATE -ld_classic) + endif() + endif() if(QT_IS_MACOS_UNIVERSAL) add_lipo_command(${target} ${buildDir}/${config}) endif() |