From 5c875965978b8e7466f68ef73d02616ffd0db306 Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 31 Oct 2023 13:08:32 -0400 Subject: [PATCH] support builds incl Qt6 with clang-14,15,16,17 --- sys/unix/hints/include/compiler.370 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/unix/hints/include/compiler.370 b/sys/unix/hints/include/compiler.370 index bfeefca78..ce9896d9b 100755 --- a/sys/unix/hints/include/compiler.370 +++ b/sys/unix/hints/include/compiler.370 @@ -136,6 +136,7 @@ CCXX=clang++ -std=c++11 CLANGPPGTEQ9 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 9) CLANGPPGTEQ11 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 11) CLANGPPGTEQ14 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 14) +CLANGPPGTEQ17 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 17) ifeq "$(CLANGPPGTEQ9)" "1" #CCXXFLAGS+=-Wformat-overflow endif @@ -151,10 +152,11 @@ endif # CPLUSPLUS_NEED_DEPSUPPRESS CFLAGS+=-fPIC ifdef CPLUSPLUS_NEED17 ifeq "$(CLANGPPGTEQ14)" "1" -CCXX=clang++ -std=c++20 -else CCXX=clang++ -std=c++17 endif # clang++ greater than or equal to 14 +ifeq "$(CLANGPPGTEQ17)" "1" +CCXX=clang++ -std=c++20 +endif # clang++ greater than or equal to 17 endif # CPLUSPLUS_NEED17 endif # end of clang++-specific section CXX=$(CCXX)