syncs gcc12

nasa · Sep 6, 2022 · 86733da · 86733da
1 parent b9bb100
commit 86733da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/misc/setup-k.sh b/misc/setup-k.sh
@@ -15,10 +15,8 @@ meshlink_path="${HOME}/local/pkgs/MeshLink"
 mpi_path="/opt/hpe/hpc/mpt/mpt-2.23"
 
 export openmpi_path="/usr/local/pkgs-modules/openmpi_2.1.1_intel_2017"
-
 export openmpi_parmetis_path="${module_path}/ParMETIS/4.0.3-openmpi-2.1.1-intel_2017.2.174"
 
-
 gcc_flags="-g -O2 -pedantic-errors -Wall -Wextra -Werror -Wunused -Wuninitialized"
 icc_flags="-g -O2 -traceback -Wall -w3 -wd1418,2259,2547,981,11074,11076,1572,49,1419 -ftrapuv"
 

diff --git a/misc/setup-mac.sh b/misc/setup-mac.sh
@@ -16,6 +16,8 @@ clangflags='-g -O2  -Werror -Wall -Wextra -Wpedantic -Weverything -Wno-unused-ma
 
 gcc12flags='-g -O2 -Werror -pedantic-errors -Wall -Wextra -Wunused -Wuninitialized -Wconversion'
 
+santflags="-fsanitize=address -fsanitize=alignment -fsanitize=bounds -fsanitize=enum -fsanitize=vptr -fsanitize=integer-divide-by-zero -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute -fsanitize=nullability-arg -fsanitize=nullability-assign -fsanitize=returns-nonnull-attribute -fsanitize=null -fsanitize=object-size -fsanitize=shift -fsanitize=signed-integer-overflow -fsanitize=unreachable -fsanitize=vla-bound"
+
 egads_path="${HOME}/local/pkgs/EngSketchPad"
 egads_svn_path="${HOME}/local/pkgs/EGADS"
 opencascade_path="${HOME}/local/pkgs/OpenCASCADE"
@@ -34,7 +36,7 @@ mkdir -p egads
     --with-parmetis=${parmetis_path} \
     --with-EGADS=${egads_path} \
     --with-OpenCASCADE=${opencascade_path} \
-    CFLAGS="${clangflags}" \
+    CFLAGS="${gcc12flags}" \
     ) \
     || exit
 
@@ -46,7 +48,7 @@ mkdir -p parmetis
     --with-parmetis=${parmetis_path} \
     --with-EGADS=${egads_path} \
     --enable-lite \
-    CFLAGS="-DHAVE_MPI ${gcc9flags}" \
+    CFLAGS="-DHAVE_MPI ${gcc12flags}" \
     CC=mpicc \
     ) \
     || exit
@@ -57,7 +59,7 @@ mkdir -p clang
     --prefix=`pwd` \
     --with-EGADS=${egads_path} \
     --with-OpenCASCADE=${opencascade_path} \
-    CFLAGS="${clangflags} -fsanitize=address -fsanitize=alignment -fsanitize=bounds -fsanitize=enum -fsanitize=vptr -fsanitize=integer-divide-by-zero -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute -fsanitize=nullability-arg -fsanitize=nullability-assign -fsanitize=returns-nonnull-attribute -fsanitize=null -fsanitize=object-size -fsanitize=shift -fsanitize=signed-integer-overflow -fsanitize=unreachable -fsanitize=vla-bound" \
+    CFLAGS="${clangflags} -fsanitize=address" \
     CC=clang \
     ) \
     || exit