Skip to content

Commit 1396113

Browse files
committed
Fix Windows slipstream: force MSYS2 gcc/g++ so arpa/inet.h is found
1 parent fa35431 commit 1396113

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

.github/workflows/release.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,18 @@ jobs:
104104
# Install MinGW-native OpenSSL via MSYS2 (provides libcrypto.a / libssl.a for MinGW)
105105
C:/msys64/usr/bin/pacman -S --noconfirm mingw-w64-x86_64-openssl mingw-w64-x86_64-pkg-config
106106
107-
- name: Pre-build picoquic with bash (MinGW)
107+
- name: Pre-build picoquic with bash (MSYS2 MinGW)
108108
shell: bash
109109
working-directory: slipstream-rust
110110
env:
111111
PICOQUIC_BUILD_DIR: ${{ github.workspace }}/slipstream-rust/.picoquic-build
112112
CMAKE_GENERATOR: MinGW Makefiles
113113
OPENSSL_ROOT_DIR: C:/msys64/mingw64
114+
CC: C:/msys64/mingw64/bin/gcc.exe
115+
CXX: C:/msys64/mingw64/bin/g++.exe
116+
AR: C:/msys64/mingw64/bin/ar.exe
114117
run: |
115-
export PATH="/c/msys64/mingw64/bin:/c/mingw64/bin:$PATH"
118+
export PATH="/c/msys64/mingw64/bin:$PATH"
116119
bash scripts/build_picoquic.sh
117120
118121
- name: Build slipstream-client
@@ -121,8 +124,12 @@ jobs:
121124
env:
122125
PICOQUIC_BUILD_DIR: ${{ github.workspace }}/slipstream-rust/.picoquic-build
123126
OPENSSL_ROOT_DIR: C:/msys64/mingw64
127+
CC: C:/msys64/mingw64/bin/gcc.exe
128+
CXX: C:/msys64/mingw64/bin/g++.exe
129+
AR: C:/msys64/mingw64/bin/ar.exe
130+
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: C:/msys64/mingw64/bin/gcc.exe
124131
run: |
125-
export PATH="/c/msys64/mingw64/bin:/c/mingw64/bin:$PATH"
132+
export PATH="/c/msys64/mingw64/bin:$PATH"
126133
cargo build --release -p slipstream-client --target x86_64-pc-windows-gnu --features slipstream-ffi/openssl-vendored
127134
cp target/x86_64-pc-windows-gnu/release/slipstream-client.exe ../slipstream-client-windows-amd64.exe
128135

0 commit comments

Comments
 (0)