diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-05-29 18:47:29 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-05-30 17:19:29 -0700 |
| commit | 1d52df8140104a969699f774dbae4fe25d2f6d00 (patch) | |
| tree | e0d1945770ed05d4391d8dea07c2b271ffd79be7 | |
| parent | f706ccc3fc4704a178a0235d23284bbea2f2a6c7 (diff) | |
| download | vcpkg-1d52df8140104a969699f774dbae4fe25d2f6d00.tar.gz vcpkg-1d52df8140104a969699f774dbae4fe25d2f6d00.zip | |
Fix toolchain for linux
| -rw-r--r-- | scripts/toolchains/linux.cmake | 4 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/build.cpp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index 1ad180b4b..54f80c6a2 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -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 "")
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index b8ccb15bf..bcde9217c 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -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); |