mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 11:21:12 +08:00
3f55ea9fce
#35084 introduced a regression for native ARM Linux builds where the toolchain would mistakenly try to reference a cross-compiler (e.g. `aarch64-linux-gnu-gcc`) despite building natively because vcpkg spells the architecture differently from what the system reports (`arm64` vs. `aarch64`). This fixes the issue by checking whether the `CMAKE_HOST_SYSTEM_PROCESSOR` matches the target (in CMake's spelling of the architecture). --------- Co-authored-by: Kai Pastor <dg0yt@darc.de>
77 lines
3.8 KiB
CMake
77 lines
3.8 KiB
CMake
if(NOT _VCPKG_LINUX_TOOLCHAIN)
|
|
set(_VCPKG_LINUX_TOOLCHAIN 1)
|
|
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
|
|
set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
|
|
endif()
|
|
set(CMAKE_SYSTEM_NAME Linux CACHE STRING "")
|
|
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
|
set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "")
|
|
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
|
set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "")
|
|
string(APPEND VCPKG_C_FLAGS " -m32")
|
|
string(APPEND VCPKG_CXX_FLAGS " -m32")
|
|
string(APPEND VCPKG_LINKER_FLAGS " -m32")
|
|
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
|
set(CMAKE_SYSTEM_PROCESSOR armv7l CACHE STRING "")
|
|
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l")
|
|
|
|
if(NOT DEFINED CMAKE_CXX_COMPILER)
|
|
set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++")
|
|
endif()
|
|
if(NOT DEFINED CMAKE_C_COMPILER)
|
|
set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc")
|
|
endif()
|
|
if(NOT DEFINED CMAKE_ASM_COMPILER)
|
|
set(CMAKE_ASM_COMPILER "arm-linux-gnueabihf-gcc")
|
|
endif()
|
|
if(NOT DEFINED CMAKE_ASM-ATT_COMPILER)
|
|
set(CMAKE_ASM-ATT_COMPILER "arm-linux-gnueabihf-as")
|
|
endif()
|
|
message(STATUS "Cross compiling arm on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
|
|
endif()
|
|
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
|
set(CMAKE_SYSTEM_PROCESSOR aarch64 CACHE STRING "")
|
|
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
|
|
|
|
if(NOT DEFINED CMAKE_CXX_COMPILER)
|
|
set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++")
|
|
endif()
|
|
if(NOT DEFINED CMAKE_C_COMPILER)
|
|
set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc")
|
|
endif()
|
|
if(NOT DEFINED CMAKE_ASM_COMPILER)
|
|
set(CMAKE_ASM_COMPILER "aarch64-linux-gnu-gcc")
|
|
endif()
|
|
if(NOT DEFINED CMAKE_ASM-ATT_COMPILER)
|
|
set(CMAKE_ASM-ATT_COMPILER "aarch64-linux-gnu-as")
|
|
endif()
|
|
message(STATUS "Cross compiling arm64 on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
|
|
endif()
|
|
endif()
|
|
|
|
get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
|
|
if(NOT _CMAKE_IN_TRY_COMPILE)
|
|
string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ")
|
|
string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ")
|
|
string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ")
|
|
string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ")
|
|
string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
|
|
string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
|
|
|
|
string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
|
|
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
|
|
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
|
|
if(VCPKG_CRT_LINKAGE STREQUAL "static")
|
|
string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT "-static ")
|
|
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT "-static ")
|
|
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT "-static ")
|
|
endif()
|
|
string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
|
|
string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
|
|
string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
|
|
string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
|
|
string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
|
|
string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
|
|
endif()
|
|
endif()
|