Compiler things

Author: NoraHagmeyer

etc/bashrc

@@ -74,9 +74,10 @@ export WM_COMPILER_TYPE=system
 
 #- Compiler:
 #    WM_COMPILER = Gcc | Gcc48 ... Gcc62 | Clang | Icx
-export WM_COMPILER=Gcc
+export WM_COMPILER=DOCC # Clang #Gcc
 unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 
+echo $WM_COMPILER
 #- Memory addressing:
 #    On a 64bit OS this can be 32bit or 64bit
 #    On a 32bit OS addressing is 32bit and this option is not used
@@ -89,7 +90,7 @@ export WM_PRECISION_OPTION=SP
 
 #- Label size:
 #    WM_LABEL_SIZE = 32 | 64
-export WM_LABEL_SIZE=32
+export WM_LABEL_SIZE=64
 
 #- Optimised, debug, profiling:
 #    WM_COMPILE_OPTION = Opt | Debug | Prof

etc/config.sh/compiler

@@ -37,6 +37,8 @@ OpenFOAM | ThirdParty)
     gmp_version=gmp-5.1.2
     mpfr_version=mpfr-3.1.2
     mpc_version=mpc-1.0.1
+   
+   echo $WM_COMPILER
 
     case "$WM_COMPILER" in
     Gcc55)
@@ -62,10 +64,14 @@ OpenFOAM | ThirdParty)
         ;;
     Clang)
         # Using clang - not gcc
-        export WM_CC='clang'
-        export WM_CXX='clang++'
+        export WM_CC='clang-15'
+        export WM_CXX='clang++-15'
         clang_version=llvm-3.7.0
         ;;
+    DOCC)
+        export WM_CC='docc'
+        export WM_CXX='docc-cpp'
+        ;;
     *)
         /bin/cat <<USAGE 1>&2
 

wmake/rules/linux64Clang/c

@@ -2,7 +2,7 @@ SUFFIXES += .c
 
 cWARN        = -Wall
 
-cc          = clang -m64
+cc          = clang-15 -m64
 
 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 

wmake/rules/linux64Clang/c++

@@ -8,7 +8,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor \
 c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs \
               -Wno-tautological-undefined-compare -Wno-shift-negative-value
 
-CC          = clang++ -std=c++14 -m64
+CC          = clang++-15 -std=c++14 -m64
 
 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 

wmake/rules/linux64DOCC/c

@@ -0,0 +1,16 @@
+SUFFIXES += .c
+
+cWARN        = -Wall
+
+cc          = docc -m64
+
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

wmake/rules/linux64DOCC/c++

@@ -0,0 +1,28 @@
+SUFFIXES += .C
+
+c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor \
+              -Wno-unused-parameter -Wno-invalid-offsetof \
+              -Wno-undefined-var-template -Wno-unqualified-std-cast-call
+
+# Suppress some warnings for flex++
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs \
+              -Wno-tautological-undefined-compare -Wno-shift-negative-value
+
+CC          = docc-cpp -std=c++14 -m64
+
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) \
+              $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed

wmake/rules/linux64DOCC/c++Debug

@@ -0,0 +1,2 @@
+c++DBUG    = -g -DFULLDEBUG
+c++OPT      = -O0

wmake/rules/linux64DOCC/c++Opt

@@ -0,0 +1,2 @@
+c++DBUG     =
+c++OPT      = -O3

wmake/rules/linux64DOCC/c++Prof

@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2

wmake/rules/linux64DOCC/cDebug

@@ -0,0 +1,2 @@
+cDBUG       = -g -DFULLDEBUG
+cOPT        = -O0