Skip to content

Commit 6ea12b1

Browse files
authored
Merge pull request #304 from grafikrobot/patch-1
Fix building with clang-win 32 bit.
2 parents 3847230 + 3378976 commit 6ea12b1

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/multi.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
echo "::endgroup::"
9393
9494
native:
95-
name: native ${{ matrix.os }} ${{ matrix.toolset }}
95+
name: native ${{ matrix.os }} ${{ matrix.toolset }} ${{ matrix.options }}
9696
runs-on: ${{ matrix.os }}-latest
9797
strategy:
9898
fail-fast: false
@@ -104,6 +104,7 @@ jobs:
104104
- { os: macos, toolset: clang, options: cxxstd=17 }
105105
- { os: windows, toolset: gcc }
106106
- { os: windows, toolset: clang-win, options: embed-manifest-via=linker }
107+
- { os: windows, toolset: clang-win, options: "address-model=32 embed-manifest-via=linker" }
107108

108109
steps:
109110
- name: Checkout Boost super-repo

build/Jamfile.v2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ project
3939
<define>BOOST_CONTEXT_SOURCE
4040
<threading>multi
4141
<toolset>msvc,<address-model>32:<asmflags>/safeseh
42+
<toolset>clang-win,<address-model>32:<asmflags>/safeseh
4243
: usage-requirements
4344
<link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
4445
<define>BOOST_CONTEXT_NO_LIB=1

0 commit comments

Comments
 (0)