Use llvm-objcopy on Linux x64 (#48444)

dotnet · Feb 18, 2021 · ba50840 · ba50840
1 parent 1bbf42c
commit ba50840
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/eng/native/configuretools.cmake b/eng/native/configuretools.cmake
@@ -7,15 +7,15 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
 endif()
 
 if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_BROWSER)
-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     if(APPLE)
       set(TOOLSET_PREFIX "")
     else()
       set(TOOLSET_PREFIX "llvm-")
     endif()
-  elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+  elseif(CMAKE_C_COMPILER_ID MATCHES "GNU")
     if(CMAKE_CROSSCOMPILING)
-      set(TOOLSET_PREFIX "${CMAKE_CXX_COMPILER_TARGET}-")
+      set(TOOLSET_PREFIX "${CMAKE_C_COMPILER_TARGET}-")
     else()
       set(TOOLSET_PREFIX "")
     endif()
@@ -55,7 +55,7 @@ if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_BROWSER)
     elseif(CMAKE_CROSSCOMPILING AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD AND (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR
        CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm))
       set(TOOLSET_PREFIX "${TOOLCHAIN}-")
-    else()
+    elseif(CLR_CMAKE_TARGET_ALPINE_LINUX AND CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
       set(TOOLSET_PREFIX "")
     endif()