зеркало из https://github.com/microsoft/vcpkg.git
[boost-modular-build-helper] Fix x86 MinGW build (#27955)
This commit is contained in:
Родитель
c889853f7b
Коммит
2705bcd229
|
@ -48,11 +48,11 @@ else()
|
|||
list(APPEND B2_OPTIONS architecture=x86)
|
||||
endif()
|
||||
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32)
|
||||
list(APPEND B2_OPTIONS "asmflags=/safeseh")
|
||||
endif()
|
||||
|
||||
if(VCPKG_DETECTED_MSVC)
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
||||
list(APPEND B2_OPTIONS "asmflags=/safeseh")
|
||||
endif()
|
||||
|
||||
if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
set(USER_CONFIG_TOOLSET clang-win)
|
||||
else()
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"$comment": "When changing this file also update and run scripts/boost/generate-ports.ps1",
|
||||
"name": "boost-modular-build-helper",
|
||||
"version": "1.80.0",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"description": "Internal vcpkg port used to build Boost libraries",
|
||||
"license": "MIT",
|
||||
"dependencies": [
|
||||
|
|
|
@ -99,7 +99,7 @@ $portVersions = @{
|
|||
"boost-logic" = 1;
|
||||
"boost-math" = 1;
|
||||
"boost-metaparse" = 1;
|
||||
"boost-modular-build-helper" = 3;
|
||||
"boost-modular-build-helper" = 4;
|
||||
"boost-move" = 1;
|
||||
"boost-mp11" = 1;
|
||||
"boost-mpi" = 1;
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0631e980f0a18e2175424e672b55709b84e19aa3",
|
||||
"version": "1.80.0",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "4a8c162e2661795b998a8435b6ec7207608fe73a",
|
||||
"version": "1.80.0",
|
||||
|
|
|
@ -862,7 +862,7 @@
|
|||
},
|
||||
"boost-modular-build-helper": {
|
||||
"baseline": "1.80.0",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"boost-move": {
|
||||
"baseline": "1.80.0",
|
||||
|
|
Загрузка…
Ссылка в новой задаче