From a03875789ff2ab2883ecbba044f85abc244b692d Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Tue, 3 Jan 2023 15:48:08 +0100 Subject: Fixed CXXTYPE --- common.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 30e6abb..2dba055 100644 --- a/common.mk +++ b/common.mk @@ -1,14 +1,6 @@ CXX=clang++-14 #CXX=g++-12 -ifeq ($(CXX),clang++-14) -CXXTYPE=clang++ -else ifeq ($(CXX),clang++) -CXXTYPE=clang++ -else -CXXTYPE=g++ -endif - ifeq ($(shell which $(CXX)),) CXX=clang++-13 endif @@ -48,16 +40,20 @@ endif ifeq ($(CXX),clang++-10) LIBS+=-fuse-ld=lld-10 -lstdc++ +CXXTYPE=clang++ else ifeq ($(CXX),clang++-11) #LIBS+=-fuse-ld=lld-11 -lc++ -lc++abi LLVMPROFDATA=llvm-profdata-11 LLVMCOV=llvm-cov-11 +CXXTYPE=clang++ else ifeq ($(CXX),clang++-14) #LIBS+=-fuse-ld=lld-14 -lc++ -lc++abi LLVMPROFDATA=llvm-profdata-14 LLVMCOV=llvm-cov-14 +CXXTYPE=clang++ else LIBS+=-lstdc++ -lstdc++fs +CXXTYPE=g++ endif CXXFLAGS+=$(shell pkg-config --cflags qrcodegencpp GraphicsMagick++ fmt sqlite3) -- cgit v1.2.3