From 2705bcd22939a0ba54e255adf9cf3507d8577000 Mon Sep 17 00:00:00 2001
From: Todor Prokopov <koprok@users.noreply.github.com>
Date: Wed, 23 Nov 2022 20:07:20 +0200
Subject: [PATCH] [boost-modular-build-helper] Fix x86 MinGW build (#27955)

---
 ports/boost-modular-build-helper/CMakeLists.txt | 8 ++++----
 ports/boost-modular-build-helper/vcpkg.json     | 2 +-
 scripts/boost/generate-ports.ps1                | 2 +-
 versions/b-/boost-modular-build-helper.json     | 5 +++++
 versions/baseline.json                          | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index e8c37b80e5..a83813707c 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -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()
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index 30e6d8d2bc..14c120f527 100644
--- a/ports/boost-modular-build-helper/vcpkg.json
+++ b/ports/boost-modular-build-helper/vcpkg.json
@@ -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": [
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index 6d823a4d13..7722c864a3 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -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;
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index 6f4a968291..c065593a10 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0631e980f0a18e2175424e672b55709b84e19aa3",
+      "version": "1.80.0",
+      "port-version": 4
+    },
     {
       "git-tree": "4a8c162e2661795b998a8435b6ec7207608fe73a",
       "version": "1.80.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 25e3a975c0..3cdd039eda 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -862,7 +862,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.80.0",
-      "port-version": 3
+      "port-version": 4
     },
     "boost-move": {
       "baseline": "1.80.0",