diff options
| author | Roland Reichwein <mail@reichwein.it> | 2023-01-03 15:48:08 +0100 |
|---|---|---|
| committer | Roland Reichwein <mail@reichwein.it> | 2023-01-03 15:48:08 +0100 |
| commit | a03875789ff2ab2883ecbba044f85abc244b692d (patch) | |
| tree | 20c67dd5c5c02146e833535dc1645a6d727cc131 | |
| parent | 9db6941a45213c0d73e9b66822b28003bb78060b (diff) | |
Fixed CXXTYPE
| -rw-r--r-- | common.mk | 12 | ||||
| -rw-r--r-- | tests/Makefile | 1 |
2 files changed, 4 insertions, 9 deletions
@@ -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) diff --git a/tests/Makefile b/tests/Makefile index dd357b3..778fd37 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -34,7 +34,6 @@ ifeq ($(CXXTYPE),clang++) $(LLVMCOV) report --ignore-filename-regex='google' --ignore-filename-regex='test-' --ignore-filename-regex='Magick' --show-region-summary=0 -instr-profile unittests.profdata unittests else ./unittests - #gcov-12 storage.o gcovr -r .. endif |