Skip to content

Commit 3323576

Browse files
committed
pass 8
1 parent ae18a95 commit 3323576

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.github/workflows/build-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
msystem: ${{ matrix.msystem }}
6363
install: >-
6464
cmake
65+
gcc
6566
6667
- name: Test for Win Deps cache hit
6768
id: windep-cache

buildconfig/windependencies/build_win_deps.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ mkdir $WIN_PREFIX_PATH
99
# for great speed.
1010
export MAKEFLAGS="-j 2"
1111

12+
# for scripts using ./configure
13+
export CC="gcc"
14+
export CXX="g++"
15+
1216
# With this we
1317
# 1) Force install prefix to $WIN_PREFIX_PATH
1418
# 2) use lib directory (and not lib64)
@@ -19,7 +23,7 @@ export PG_BASE_CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$WIN_PREFIX_PATH \
1923
-DCMAKE_INSTALL_LIBDIR:PATH=lib \
2024
-DCMAKE_BUILD_TYPE=Release \
2125
-DBUILD_SHARED_LIBS=true \
22-
-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_MAKE_PROGRAM=make"
26+
-DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_MAKE_PROGRAM=make"
2327

2428
export ARCHS_CONFIG_FLAG="--prefix=$WIN_PREFIX_PATH"
2529

0 commit comments

Comments
 (0)