Skip to content

Try checking for Darwin and Clang in addition to AppleClang #125758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jtschuster wants to merge 1 commit into from
Closed

Try checking for Darwin and Clang in addition to AppleClang #125758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions eng/native/configurecompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ include(${CMAKE_CURRENT_LIST_DIR}/configureoptimization.cmake)
if(CLR_CMAKE_TARGET_BROWSER AND DEFINED TRYRUN_BROWSER_EMSCRIPTEN_VERSION)
file(READ "${CMAKE_CURRENT_LIST_DIR}/../../src/mono/browser/emscripten-version.txt" CURRENT_EMSCRIPTEN_VERSION)
string(STRIP "${CURRENT_EMSCRIPTEN_VERSION}" CURRENT_EMSCRIPTEN_VERSION)

if(NOT TRYRUN_BROWSER_EMSCRIPTEN_VERSION STREQUAL CURRENT_EMSCRIPTEN_VERSION)
message(WARNING
message(WARNING
"Emscripten version mismatch detected!\n"
" Current Emscripten: ${CURRENT_EMSCRIPTEN_VERSION}\n"
" Cached features for: ${TRYRUN_BROWSER_EMSCRIPTEN_VERSION}\n"
Expand All @@ -49,10 +49,14 @@ if (CLR_CMAKE_HOST_UNIX)
endif()
endif()

if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
# enable $<LINK_GROUP:RESCAN> on AppleClang as a no-op
if ((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") OR
(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
# enable $<LINK_GROUP:RESCAN> on Darwin clang toolchains as a no-op
set(CMAKE_LINK_GROUP_USING_RESCAN "" "")
set(CMAKE_LINK_GROUP_USING_RESCAN_SUPPORTED ON)
endif()

if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
# Force usage of classic linker on Xcode 15
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15 AND
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
Expand Down
Loading