Skip to content

Commit 1b72275

Browse files
committed
Merge branch 'framework/gfortran_options_cleanup' into hotfix-v7.1 (PR #802)
This merge introduces several minor updates and clean-up changes to the 'gfortran' build target: 1. Remove the -m64 flag, which is architecture-specific 2. Change -O3 to -g in the definition of CXXFLAGS_DEBUG 3. Enable all available run-time checks with -fcheck=all for debug builds * framework/gfortran_options_cleanup: Enable all runtime checks when DEBUG=true in gfortran build target Remove -m64 from all compiler flag sets in gfortran build target Change -O3 to -g in CXXFLAGS_DEBUG for gfortran build target
2 parents 4569999 + f14f0ce commit 1b72275

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,14 @@ gfortran:
219219
"CC_SERIAL = gcc" \
220220
"CXX_SERIAL = g++" \
221221
"FFLAGS_PROMOTION = -fdefault-real-8 -fdefault-double-8" \
222-
"FFLAGS_OPT = -O3 -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form" \
223-
"CFLAGS_OPT = -O3 -m64" \
224-
"CXXFLAGS_OPT = -O3 -m64" \
225-
"LDFLAGS_OPT = -O3 -m64" \
226-
"FFLAGS_DEBUG = -g -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow" \
227-
"CFLAGS_DEBUG = -g -m64" \
228-
"CXXFLAGS_DEBUG = -O3 -m64" \
229-
"LDFLAGS_DEBUG = -g -m64" \
222+
"FFLAGS_OPT = -O3 -ffree-line-length-none -fconvert=big-endian -ffree-form" \
223+
"CFLAGS_OPT = -O3" \
224+
"CXXFLAGS_OPT = -O3" \
225+
"LDFLAGS_OPT = -O3" \
226+
"FFLAGS_DEBUG = -g -ffree-line-length-none -fconvert=big-endian -ffree-form -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow" \
227+
"CFLAGS_DEBUG = -g" \
228+
"CXXFLAGS_DEBUG = -g" \
229+
"LDFLAGS_DEBUG = -g" \
230230
"FFLAGS_OMP = -fopenmp" \
231231
"CFLAGS_OMP = -fopenmp" \
232232
"CORE = $(CORE)" \

0 commit comments

Comments
 (0)