Skip to content

Commit 51ffc8b

Browse files
committed
Correct the arch handling for gcc
1 parent f7f58ef commit 51ffc8b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,10 @@ jobs:
216216
run: |
217217
# Qt Online Installer only provides x86-64 binaries (not arm64) prior to Qt 6.2.0.
218218
if [[ '${{ matrix.qt }}' =~ ^(5|6\.[01])\. ]]; then arch=x86_64
219-
# GitHub's macos-15 runners only support arm64, and no longer support x86-64.
220-
elif [[ '${{ matrix.os }} == 'macos-15' ]]; then arch=arm64
219+
# GitHub runners' (homebrew'd) gcc's only support support x86-64 prior to macos-14, and only arm64 after.
220+
# Note: if we attempt to use multiple archs, gcc will warn, but continue, resulting in later failures.
221+
elif [[ '${{ matrix.cc }}' == gcc-* ]]; then
222+
if [[ '${{ matrix.os }}' == 'macos-13' ]]; then arx='x86_64'; else arch='arm64'; fi
221223
# Otherwise, default to universal binaries, where possible.
222224
else arch='arm64;x86_64'; fi
223225
echo "CMAKE_OSX_ARCHITECTURES=${arch}" >> $GITHUB_ENV

0 commit comments

Comments
 (0)