From 955b3b84dd2dadd539dbc707c26c33ad3e63b374 Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Mon, 6 Dec 2021 16:31:02 +0100 Subject: Fixes for new compiler versions --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f3f072f..50c49b6 100644 --- a/Makefile +++ b/Makefile @@ -3,30 +3,30 @@ VERSION=$(shell dpkg-parsechangelog --show-field Version) DISTROS=base debian10 ubuntu2004 ubuntu2010 -ifeq ($(wildcard $(shell which clang++-11)),) +ifeq ($(wildcard $(shell which clang++-13)),) ifeq ($(wildcard $(shell which clang++)),) -CXX=g++-10 +CXX=g++-11 else CXX=clang++ endif else -CXX=clang++-11 +CXX=clang++-13 endif # boost is buggy for C++20: error: static_assert failed due to requirement 'detail::is_endian_reversible_inplace -#STANDARD=c++17 -STANDARD=c++20 +STANDARD=c++17 +#STANDARD=c++20 ifeq ($(CXXFLAGS),) -CXXFLAGS=-O0 -g -D_DEBUG -#CXXFLAGS=-O2 -DNDEBUG +#CXXFLAGS=-O0 -g -D_DEBUG +CXXFLAGS=-O2 -DNDEBUG endif CXXFLAGS+=-Wall -Iinclude -std=$(STANDARD) -ifeq ($(CXX),clang++-11) +ifeq ($(CXX),clang++-13) COMPILER_SUITE=clang -LIBS+=-fuse-ld=lld-11 +LIBS+=-fuse-ld=lld-13 endif ifeq ($(CXX),clang++) -- cgit v1.2.3