Skip to content

Commit 4bf8f28

Browse files
author
Michal Klocek
committed
Do pass -isysroot optionally for gn build
With cmake 4.0 changes, we can no longer expect CMAKE_OSX_SYSROOT to be set: https://cmake.org/cmake/help/latest/release/4.0.html#other-changes Therefore make the setting optional for gn, as it should not be required on "modern macOS". Pick-to: 6.9 6.8 Task-number: QTBUG-135621 Change-Id: I48ed72d6e920fec4c395eb04c8a18619e045c1b4 Reviewed-by: Moss Heim <[email protected]>
1 parent cf2d52b commit 4bf8f28

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/gn/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ add_custom_command(
7979
--platform ${platform}
8080
--ar ${CMAKE_AR}
8181
--qt-version "${QT_REPO_MODULE_VERSION}.qtwebengine.qt.io"
82-
$<$<PLATFORM_ID:Darwin>:--isysroot>
83-
$<$<PLATFORM_ID:Darwin>:${CMAKE_OSX_SYSROOT}>
82+
$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${CMAKE_OSX_SYSROOT}>>:--isysroot>
83+
$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${CMAKE_OSX_SYSROOT}>>:${CMAKE_OSX_SYSROOT}>
8484
$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${OSX_ARCH}>>:--osx-architectures>
8585
$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${OSX_ARCH}>>:${OSX_ARCH}>
8686
${GN_GCC_LEGACY_SUPPORT}

0 commit comments

Comments
 (0)