mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 02:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix toolchain for linux

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-05-29 18:47:29 -07:00
parent f706ccc3fc
commit 1d52df8140
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/toolchains/linux.cmake
View File

@ -5,8 +5,8 @@ set(CMAKE_SYSTEM_NAME Linux CACHE STRING "")
get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
if(NOT _CMAKE_IN_TRY_COMPILE)
set(CMAKE_CXX_FLAGS " ${VCPKG_CXX_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS " ${VCPKG_C_FLAGS}" CACHE STRING "")
set(CMAKE_CXX_FLAGS "${VCPKG_CXX_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS "${VCPKG_C_FLAGS}" CACHE STRING "")
set(CMAKE_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "")
set(CMAKE_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "")

5
toolsrc/src/vcpkg/build.cpp
View File

@ -465,6 +465,11 @@ namespace vcpkg::Build
abi_tag_entries.emplace_back(
AbiEntry{"control", Commands::Hash::get_file_hash(fs, config.port_dir / "CONTROL", "SHA1")});
if (pre_build_info.cmake_system_name == "Linux")
{
abi_tag_entries.emplace_back(AbiEntry{"toolchain", "1"});
}
abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag});
const std::string features = Strings::join(";", config.feature_list);