Skip to content

Commit

Permalink
Make sure vcpkg uses the rtools toolchain instead of windows mingw
Browse files Browse the repository at this point in the history
vcpkg doesnt detect the rtools mingw toolchain, which causes issues in the faiss
extension.
  • Loading branch information
JAicewizard committed Sep 16, 2024
1 parent 64085c8 commit 47df24d
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/_extension_distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,12 @@ jobs:
update-rtools: true
rtools-version: '42' # linker bug in 43

- name: setup rtools gcc for vcpkg
run: |
cp C:/rtools42/x86_64-w64-mingw32.static.posix/bin/gcc.exe C:/rtools42/x86_64-w64-mingw32.static.posix/bin/x86_64-w64-mingw32-gcc.exe
cp C:/rtools42/x86_64-w64-mingw32.static.posix/bin/g++.exe C:/rtools42/x86_64-w64-mingw32.static.posix/bin/x86_64-w64-mingw32-g++.exe
cp C:/rtools42/x86_64-w64-mingw32.static.posix/bin/gfortran.exe C:/rtools42/x86_64-w64-mingw32.static.posix/bin/x86_64-w64-mingw32-gfortran.exe
- uses: actions/checkout@v3
name: Checkout Extension CI tools
if: ${{inputs.override_ci_tools_ref != ''}}
Expand All @@ -560,12 +566,15 @@ jobs:
with:
vcpkgGitCommitId: ${{ inputs.vcpkg_commit }}
vcpkgGitURL: ${{ inputs.vcpkg_url }}
<<<<<<< Updated upstream

- name: Run custom toolchain script
if: ${{ inputs.custom_toolchain_script }}
shell: bash
run: |
bash scripts/setup-custom-toolchain.sh
=======
>>>>>>> Stashed changes

- name: Build & test extension
env:
Expand Down

0 comments on commit 47df24d

Please sign in to comment.