aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorautoantwort <41973254+autoantwort@users.noreply.github.com>2021-02-24 22:38:42 +0100
committerGitHub <noreply@github.com>2021-02-24 13:38:42 -0800
commitfeb0a364d8d17c99b7209da3a2b331ebc011f754 (patch)
tree013ce0b52397c7de473101de4b9d1f83169c87ff /ports
parentf5f494d0879b83b8e620a12d938048ae642a09e1 (diff)
downloadvcpkg-feb0a364d8d17c99b7209da3a2b331ebc011f754.tar.gz
vcpkg-feb0a364d8d17c99b7209da3a2b331ebc011f754.zip
[boost] /safeseh for assembly (#16375)
* [boost] build boost on windows x86 with /safeseh * add version files
Diffstat (limited to 'ports')
-rw-r--r--ports/boost-modular-build-helper/boost-modular-build.cmake5
-rw-r--r--ports/boost-modular-build-helper/vcpkg.json2
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index 09daaeea3..cd97df9e9 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -307,6 +307,11 @@ function(boost_modular_build)
list(APPEND B2_OPTIONS address-model=64 architecture=power)
else()
list(APPEND B2_OPTIONS address-model=32 architecture=x86)
+
+ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ list(APPEND B2_OPTIONS "asmflags=/safeseh")
+ endif()
+
endif()
file(TO_CMAKE_PATH "${_bm_DIR}/nothing.bat" NOTHING_BAT)
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index 93a19943c..6d31eb2ab 100644
--- a/ports/boost-modular-build-helper/vcpkg.json
+++ b/ports/boost-modular-build-helper/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "boost-modular-build-helper",
"version-string": "1.75.0",
- "port-version": 5,
+ "port-version": 6,
"dependencies": [
"boost-uninstall"
]