From 53c236e53ce61f660aba944aad7f376a91d6e344 Mon Sep 17 00:00:00 2001 From: Frederik Seiffert Date: Tue, 4 Oct 2022 09:57:54 +0200 Subject: [PATCH 1/2] libdispatch: enable building for x86 --- phases/18-libdispatch.bat | 6 ------ 1 file changed, 6 deletions(-) diff --git a/phases/18-libdispatch.bat b/phases/18-libdispatch.bat index 37f3ccf..570694c 100644 --- a/phases/18-libdispatch.bat +++ b/phases/18-libdispatch.bat @@ -8,12 +8,6 @@ set TAG= :: load environment and prepare project call "%~dp0\..\scripts\common.bat" prepare_project || exit /b 1 -if "%ARCH%" == "x86" ( - echo Skipping libdispatch for x86 - echo Blocked on issue: https://bugs.swift.org/browse/SR-14314 - exit /b 0 -) - set BUILD_DIR="%SRCROOT%\%PROJECT%\build-%ARCH%-%BUILD_TYPE%" if exist "%BUILD_DIR%" (rmdir /S /Q "%BUILD_DIR%" || exit /b 1) mkdir "%BUILD_DIR%" || exit /b 1 From e86aa6618a5de3499a79888c78612d1921f5b91d Mon Sep 17 00:00:00 2001 From: Frederik Seiffert Date: Tue, 4 Oct 2022 15:19:31 +0200 Subject: [PATCH 2/2] CI: use x64-native cross tools to build x86 code This is also used by the Swift CI: https://github.com/apple/swift-corelibs-libdispatch/issues/606#event-7502749037 See https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fffb197..ed6033f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - arch: [x86, x64] + arch: [x64_x86, x64] steps: - uses: actions/checkout@v3