Skip to content

Commit ab05db9

Browse files
committed
Switch back to gcc.
1 parent 04f9167 commit ab05db9

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/ccpp.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ jobs:
9494
repository: 'davidgiven/fluxengine-testdata'
9595
path: 'fluxengine-testdata'
9696

97+
- uses: actions/checkout@v4
98+
with:
99+
repository: 'abseil/abseil-cpp'
100+
path: 'abseil'
101+
97102
- uses: msys2/setup-msys2@v2
98103
with:
99104
msystem: mingw64
@@ -102,8 +107,11 @@ jobs:
102107
run: |
103108
set -x
104109
pacman -S --needed --noconfirm pactoys make python diffutils ninja
105-
pacboy -S --needed --noconfirm protobuf:p pkg-config:p curl-winssl:p file:p glfw:p mbedtls:p sqlite:p freetype:p boost:p clang:p binutils:p
110+
pacboy -S --needed --noconfirm protobuf:p pkg-config:p curl-winssl:p file:p glfw:p mbedtls:p sqlite:p freetype:p boost:p gcc:p binutils:p
106111
112+
- name: abseil
113+
run: |
114+
cd abseil && mkdir build && cd build &&
107115
- name: run
108116
run: |
109117
make -C fluxengine BUILDTYPE=windows

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export BUILDTYPE
1010

1111
ifeq ($(BUILDTYPE),windows)
1212
MINGW = x86_64-w64-mingw32-
13-
CC = /mingw64/bin/clang
14-
CXX = /mingw64/bin/clang++
13+
CC = $(MINGW)gcc
14+
CXX = $(MINGW)g++
1515
CFLAGS += -g -O3 \
1616
-ffunction-sections \
1717
-fdata-sections \

0 commit comments

Comments
 (0)