Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

Commit

Permalink
Fix #346: GHA: CLANG started failing
Browse files Browse the repository at this point in the history
  • Loading branch information
xparq committed Dec 3, 2023
1 parent 386df0a commit 2046ca3
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ else
TOOLCHAIN ?= mingw
endif


#=============================================================================
# Workaround for #346
ifeq "$(CC)" "clang++"
GHA_OLD_CLANG_WORKAROUND := -stdlib=libc++
endif
#=============================================================================



# Use `make SFML_DIR=...` to override:
SFML_DIR ?= extern/sfml/$(TOOLCHAIN)

Expand Down Expand Up @@ -50,7 +60,7 @@ TEST_OBJ := test/main
SMOKE_TEST_OBJ := test/smoke

CC := g++
CFLAGS := -I$(SFML_DIR)/include -I./include -std=c++20 -pedantic -Wall -Wextra -Wshadow -Wwrite-strings -O2
CFLAGS := -I$(SFML_DIR)/include -I./include -std=c++20 $(GHA_OLD_CLANG_WORKAROUND) -pedantic -Wall -Wextra -Wshadow -Wwrite-strings -O2
LDFLAGS := $(LDFLAGS) -L$(SFML_DIR)/lib
#!! This may also be needed on Debian (not on Ubuntu) -- but just compiled it on my WSL Bullseye without it, so WTF?? --:
#!! LDFLAGS := -pthread $(LDFLAGS)
Expand Down

0 comments on commit 2046ca3

Please sign in to comment.