From 6eb1ecf3619f00071eadb6080e15f381f197b298 Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Sun, 28 Feb 2021 09:55:22 +0100 Subject: Makefile update --- common.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index a7ee20c..746d1a6 100644 --- a/common.mk +++ b/common.mk @@ -1,5 +1,5 @@ CXX=g++-10 -#CXX=clang++-10 +#CXX=clang++-11 ifeq ($(shell which $(CXX)),) CXX=g++-8 @@ -21,6 +21,10 @@ ifeq ($(shell which $(CXX)),) CXX=g++ endif +ifeq ($(LINK_STATICALLY),1) +LDFLAGS+=-static +endif + ifeq ($(CXXFLAGS),) #CXXFLAGS=-O2 -g -DNDEBUG CXXFLAGS=-O0 -g -D_DEBUG @@ -31,15 +35,15 @@ endif CXXFLAGS+=-Wall -I. CXXFLAGS+=-pthread -ifeq ($(CXX),clang++-10) +ifeq ($(CXX),clang++-11) CXXFLAGS+=-std=c++20 #-stdlib=libc++ else CXXFLAGS+=-std=c++17 endif -ifeq ($(CXX),clang++-10) +ifeq ($(CXX),clang++-11) LIBS+= \ --fuse-ld=lld-10 \ +-fuse-ld=lld-11 \ -lstdc++ #-lc++ \ #-lc++abi -- cgit v1.2.3