From daae3883eb5e70b007f20388d2e949aed3be6b79 Mon Sep 17 00:00:00 2001 From: MinsukJi-NOAA <57227195+MinsukJi-NOAA@users.noreply.github.com> Date: Tue, 21 Jan 2020 08:15:42 -0500 Subject: [PATCH] Code changes to support DEBUG compilation based on appBuilder specification (#23) 1. component_MOM6.mk sets the MOM6_MAKEOPT environment variable for compile.sh 2. component_CICE.mk sets the CICE_MAKEOPT environment variable for comp_ice.backend --- src/incmake/component_CICE.mk | 2 +- src/incmake/component_MOM6.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/incmake/component_CICE.mk b/src/incmake/component_CICE.mk index 7c05f7a5..007b816a 100644 --- 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 index a4e071a7..69ba3586 100644 --- 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)"