summaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorRoland Reichwein <mail@reichwein.it>2020-03-29 19:22:58 +0200
committerRoland Reichwein <mail@reichwein.it>2020-03-29 19:22:58 +0200
commit12c12ebbdd3f843c87ba12c29727003f1f78a7ff (patch)
treee6b899d9d50dbd36e2a7dfb12bcb2cd574f2db3d /Makefile
parent6154309f0cd3ed5071996951465808f2503e2eb1 (diff)
Update to clang++-10 and g++-9
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile30
1 files changed, 16 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index ec4db3c..210e788 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,21 @@
PROJECTNAME=minicc
-CXX=clang++-9
-#CXX=g++-8
+CXX=clang++-10
+#CXX=g++-9
CXXFLAGS=-O0 -g -D_DEBUG
# -fprofile-instr-generate -fcoverage-mapping
# gcc:--coverage
#CXXFLAGS=-O2 -DNDEBUG
-CXXFLAGS+= -Wall -std=c++17 -I.
+CXXFLAGS+= -Wall -I.
-ifeq ($(CXX),clang++-9)
-# currently broken:
+ifeq ($(CXX),clang++-10)
+# broken with lld-8:
# ld.lld-8: error: undefined symbol: boost::re_detail_106700::cpp_regex_traits_implementation<char>::transform(char const*, char const*) const
-#CXXFLAGS+= -stdlib=libc++
+CXXFLAGS+=-std=c++20 -stdlib=libc++
+else
+CXXFLAGS+=-std=c++2a
endif
CXXTESTFLAGS=-Igoogletest/include -Igooglemock/include/ -Igoogletest -Igooglemock
@@ -28,18 +30,18 @@ LIBS=\
-lboost_regex \
-lpthread
-ifeq ($(CXX),clang++-9)
+ifeq ($(CXX),clang++-10)
LIBS+= \
--fuse-ld=lld-8 \
--lstdc++ \
--lstdc++fs
-#-lc++ \
-#-lc++abi \
+-fuse-ld=lld-10 \
+-lc++ \
+-lc++abi
#-lc++fs
+#-lstdc++ \
+#-lstdc++fs \
else
LIBS+= \
--lstdc++ \
--lstdc++fs
+-lstdc++
+#-lstdc++fs
endif
PROGSRC=\