Merge pull request NOAA-EMC#9 from NOAA-EMC/develop

Code changes to support DEBUG compilation based on appBuilder specifi…
MinsukJi-NOAA · Jan 24, 2020 · 95a1a3b · 95a1a3b
2 parents 584c900 + daae388
commit 95a1a3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/incmake/component_CICE.mk b/src/incmake/component_CICE.mk
@@ -31,7 +31,7 @@ CICE_ALL_OPTS=\
 $(cice_mk): configure
 	$(MODULE_LOGIC)                                                   ; \
 	set -eu                                                           ; \
-	export $(CICE_ALL_OPTS)                                           ; \
+	export $(CICE_ALL_OPTS) $(CICE_MAKEOPT)                           ; \
 	cd $(CICE_SRCDIR)                                                 ; \
 	./comp_ice.backend
 	+$(MODULE_LOGIC) ; cd $(CICE_CAPDIR) ; exec $(MAKE) -f makefile.nuopc    \

diff --git a/src/incmake/component_MOM6.mk b/src/incmake/component_MOM6.mk
@@ -23,7 +23,7 @@ MOM6_ALL_OPTS=\
 
 $(mom6_mk): $(fms_mk) configure
 	-rm -fr $(MOM6_SRCDIR)/exec
-	$(MODULE_LOGIC) ; export $(MOM6_ALL_OPTS)                     ; \
+	$(MODULE_LOGIC) ; export $(MOM6_ALL_OPTS) $(MOM6_MAKEOPT)     ; \
 	set -e                                                        ; \
 	cd $(MOM6_SRCDIR)                                             ; \
 	./compile.sh --platform $(FULL_MACHINE_ID) --fms-dir "$(FMS_BINDIR)"