From 347723027c83faee91837b01599738fdf0e39e2d Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Sat, 11 Dec 2021 15:48:21 +0100 Subject: Update supported compilers and OSes --- common.mk | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 746d1a6..0a874b8 100644 --- a/common.mk +++ b/common.mk @@ -1,5 +1,16 @@ +CXX=clang++-13 + +ifeq ($(shell which $(CXX)),) +CXX=clang++-11 +endif + +ifeq ($(shell which $(CXX)),) +CXX=g++-11 +endif + +ifeq ($(shell which $(CXX)),) CXX=g++-10 -#CXX=clang++-11 +endif ifeq ($(shell which $(CXX)),) CXX=g++-8 @@ -37,6 +48,10 @@ CXXFLAGS+=-Wall -I. CXXFLAGS+=-pthread ifeq ($(CXX),clang++-11) CXXFLAGS+=-std=c++20 #-stdlib=libc++ +else ifeq ($(CXX),clang++-13) +CXXFLAGS+=-std=c++2b #-stdlib=libc++ +else ifeq ($(CXX),g++-11) +CXXFLAGS+=-std=c++20 #-stdlib=libc++ else CXXFLAGS+=-std=c++17 endif @@ -49,6 +64,10 @@ LIBS+= \ #-lc++abi #-lc++fs #-lstdc++fs +else ifeq ($(CXX),clang++-13) +LIBS+= \ +-fuse-ld=lld-13 \ +-lstdc++ else LIBS+= \ -lstdc++ \ -- cgit v1.2.3