diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gn/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gn/CMakeLists.txt b/src/gn/CMakeLists.txt index 37665465d..5e20b26f7 100644 --- a/src/gn/CMakeLists.txt +++ b/src/gn/CMakeLists.txt @@ -15,6 +15,7 @@ include(${WEBENGINE_ROOT_SOURCE_DIR}/.cmake.conf) set(GN_SOURCE_DIR ${WEBENGINE_ROOT_SOURCE_DIR}/src/3rdparty/gn) set(GN_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) +set(GN_LINKER ${CMAKE_CXX_COMPILER}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBENGINE_ROOT_SOURCE_DIR}/cmake") find_package(Python3 REQUIRED) @@ -22,6 +23,10 @@ find_package(Ninja 1.7.2 REQUIRED) if(WIN32) set(GN_EXECUTABLE gn.exe) + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + # Use lld-link instead of clang-cl. + set(GN_LINKER ${CMAKE_LINKER}) + endif() else() set(GN_EXECUTABLE gn) endif() @@ -35,7 +40,7 @@ add_custom_command( --out-path ${GN_BINARY_DIR}/$<CONFIG> --cc ${CMAKE_C_COMPILER} --cxx ${CMAKE_CXX_COMPILER} - --ld ${CMAKE_CXX_COMPILER} + --ld ${GN_LINKER} --ar ${CMAKE_AR} --qt-version "${QT_REPO_MODULE_VERSION}.qtwebengine.qt.io" $<$<PLATFORM_ID:Darwin>:--isysroot> |