From 2f69640274e362fd5f8570aaf455f717b2323118 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 3 Mar 2021 18:14:35 -0800 Subject: Revert "Use llvm-objcopy on Linux x64 (#48444)" (#49097) This reverts commit ba50840433578d97de4ad8bb9d2a2b45e7455b30. --- eng/native/configuretools.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/native/configuretools.cmake b/eng/native/configuretools.cmake index a6ebacac5aa..501aec5f6c6 100644 --- 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_C_COMPILER_ID MATCHES "Clang") + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") if(APPLE) set(TOOLSET_PREFIX "") else() set(TOOLSET_PREFIX "llvm-") endif() - elseif(CMAKE_C_COMPILER_ID MATCHES "GNU") + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") if(CMAKE_CROSSCOMPILING) - set(TOOLSET_PREFIX "${CMAKE_C_COMPILER_TARGET}-") + set(TOOLSET_PREFIX "${CMAKE_CXX_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}-") - elseif(CLR_CMAKE_TARGET_ALPINE_LINUX AND CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0) + else() set(TOOLSET_PREFIX "") endif() -- cgit v1.2.3