Skip to content

Commit 18d036f

Browse files
committed
Robustify CXX detection logic
The first line wasn't doing anything previously because CXX is defined as `g++` by default. This change means that now when CXX is undefined or empty it can be detected automatically. Additionally, the variable is marked as exported so that the detected version will be passed on to meson if it is being invoked via make.
1 parent d0623a7 commit 18d036f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
CXX ?= g++-12
1+
# When unset, discover g++. Prioritise the latest version on the path.
2+
ifeq (, $(and $(strip $(CXX)), $(filter-out default undefined, $(origin CXX))))
3+
override CXX := $(shell basename `which g++-12 g++-11 g++-10 g++-9 g++-8 g++ | head -n 1`)
4+
endif
5+
6+
export CXX
27
CXXFLAGS += $(OPTIMFLAG) $(MARCHFLAG)
38
override CXXFLAGS += -I$(SRCDIR) -I$(UTILSDIR)
49
GTESTCFLAGS := `pkg-config --cflags gtest_main`

0 commit comments

Comments
 (0)