BUG: Correcting env var substitution

ISSMteam · Jul 27, 2024 · 3148eb2 · 3148eb2
1 parent 19e3833
commit 3148eb2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/m4/issm_options.m4 b/m4/issm_options.m4
@@ -194,7 +194,7 @@ AC_DEFUN([ISSM_OPTIONS],[
 			AC_DEFINE([_IS_MSYS2_], [0], [is Windows (MSYS2 MinGW)])
 			dnl When standard Dakota installation has been updated to new 
 			dnl version, remove the following
-			if test -z "${CFLAGS}"; then
+			if test -z "${CFLAGS+x}"; then
 				export CFLAGS="-Wno-deprecated-register -Wno-return-type"
 			else
 				export CFLAGS="${CFLAGS} -Wno-deprecated-register -Wno-return-type"
@@ -2525,4 +2525,11 @@ AC_DEFUN([ISSM_OPTIONS],[
 
 	AC_MSG_RESULT([done])
 	dnl }}}
+
+	dnl Final variable substitution
+	AC_SUBST([CFLAGS])
+	AC_SUBST([COPTFLAGS])
+	AC_SUBST([CXXFLAGS])
+	AC_SUBST([CXXOPTFLAGS])
+	AC_SUBST([OSLIBS])
 ])
diff --git a/src/c/Makefile.am b/src/c/Makefile.am
@@ -817,7 +817,7 @@ endif
 
 if !MSYS2
 libISSMOverload_la_SOURCES = ./shared/String/ApiPrintf.cpp
-libISSMOverload_la_CFLAGS  = -D_C_ -fPIC $(COPTFLAGS) $(CFLAGS)
+libISSMOverload_la_CFLAGS  = -D_C_ -fPIC $(CFLAGS) $(COPTFLAGS)
 
 if VERSION
 libISSMOverload_la_LDFLAGS =
@@ -874,13 +874,13 @@ endif
 if KRIGING
 bin_PROGRAMS += kriging
 kriging_SOURCES = main/kriging.cpp
-kriging_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS)
+kriging_CXXFLAGS= $(COPTFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS)
 endif
 
 if ISSM_DAKOTA
 bin_PROGRAMS += issm_dakota
 issm_dakota_SOURCES = main/issm_dakota.cpp
-issm_dakota_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS)
+issm_dakota_CXXFLAGS= $(COPTFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS)
 bin_PROGRAMS += issm_post
 issm_post_SOURCES = main/issm_post.cpp
 issm_post_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)

diff --git a/src/wrappers/matlab/Makefile.am b/src/wrappers/matlab/Makefile.am
@@ -21,7 +21,7 @@ ALL_CXXFLAGS += -D_DO_NOT_LOAD_GLOBALS_ # Cannot have undefined symbols under MS
 ALL_CXXFLAGS += -D_USE_MATH_DEFINES # Need to open fence to math.h definitions when --std=c++ is used (which is the default)
 endif
 
-ALL_CXXFLAGS += $(CXXOPTFLAGS) $(CXXFLAGS)
+ALL_CXXFLAGS += $(CXXFLAGS) $(CXXOPTFLAGS)
 
 libISSMMatlab_la_SOURCES = $(io_sources)
 libISSMMatlab_la_CXXFLAGS = ${ALL_CXXFLAGS}

diff --git a/src/wrappers/python/Makefile.am b/src/wrappers/python/Makefile.am
@@ -19,7 +19,7 @@ ALL_CXXFLAGS += -D_DO_NOT_LOAD_GLOBALS_ # Cannot have undefined symbols under MS
 ALL_CXXFLAGS += -D_USE_MATH_DEFINES # Need to open fence to math.h definitions when --std=c++ is used (which is the default)
 endif
 
-ALL_CXXFLAGS += $(CXXOPTFLAGS) $(CXXFLAGS)
+ALL_CXXFLAGS += $(CXXFLAGS) $(CXXOPTFLAGS)
 
 libISSMPython_la_SOURCES = $(io_sources)
 libISSMPython_la_CXXFLAGS= ${ALL_CXXFLAGS}