Skip to content

Commit 2f69640

Browse files
authored
Revert "Use llvm-objcopy on Linux x64 (#48444)" (#49097)
This reverts commit ba50840.
1 parent ae5d716 commit 2f69640

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

eng/native/configuretools.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
77
endif()
88

99
if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_BROWSER)
10-
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
10+
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1111
if(APPLE)
1212
set(TOOLSET_PREFIX "")
1313
else()
1414
set(TOOLSET_PREFIX "llvm-")
1515
endif()
16-
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU")
16+
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
1717
if(CMAKE_CROSSCOMPILING)
18-
set(TOOLSET_PREFIX "${CMAKE_C_COMPILER_TARGET}-")
18+
set(TOOLSET_PREFIX "${CMAKE_CXX_COMPILER_TARGET}-")
1919
else()
2020
set(TOOLSET_PREFIX "")
2121
endif()
@@ -55,7 +55,7 @@ if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_BROWSER)
5555
elseif(CMAKE_CROSSCOMPILING AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD AND (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR
5656
CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm))
5757
set(TOOLSET_PREFIX "${TOOLCHAIN}-")
58-
elseif(CLR_CMAKE_TARGET_ALPINE_LINUX AND CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
58+
else()
5959
set(TOOLSET_PREFIX "")
6060
endif()
6161

0 commit comments

Comments
 (0)