27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index c614b93..61e4234 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -41,9 +41,9 @@ override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
|
|
#? Try to make sure we are using GCC/G++ version 11 or later if not instructed to use g++-10
|
|
ifeq ($(CXX),g++)
|
|
V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
|
|
- ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
|
|
- ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
|
|
- override CXX := g++-11
|
|
+ ifneq ($(shell test $(V_MAJOR) -ge 10; echo $$?),0)
|
|
+ ifeq ($(shell command -v g++-10 >/dev/null; echo $$?),0)
|
|
+ override CXX := g++-10
|
|
override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
|
|
endif
|
|
endif
|
|
@@ -79,7 +79,7 @@ DEPEXT := d
|
|
OBJEXT := o
|
|
|
|
#? Flags, Libraries and Includes
|
|
-override REQFLAGS := -std=c++20
|
|
+override REQFLAGS := -std=c++2a
|
|
WARNFLAGS := -Wall -Wextra -pedantic
|
|
OPTFLAGS ?= -O2 -ftree-loop-vectorize -flto=$(THREADS)
|
|
LDCXXFLAGS := -pthread -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector -fstack-clash-protection $(ADDFLAGS)
|