Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dynamic CCPP build #54

Merged
merged 2 commits into from
Apr 23, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions src/incmake/component_CCPP.mk
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,15 @@ ifneq (,$(findstring DEBUG=Y,$(FV3_MAKEOPT)))
override CCPP_CONFOPT += --debug
endif

# Process make options for static CCPP build
ifneq (,$(findstring STATIC=Y,$(FV3_MAKEOPT)))
ifneq (,$(findstring SUITES=,$(FV3_MAKEOPT)))
# Extract name of suite definition file for static build using sed;
# Sam Trahan most likely knows a much better way for doing this!
# - remove everything leading up to the name of the suite definition file
# - remove everything following the name of the suite definition file
SUITES = $(shell echo $(FV3_MAKEOPT) | sed 's/.* SUITES=//' | sed 's/ .*//')
override CCPP_CONFOPT += --static --suites=$(SUITES)
else
$(error Option STATIC=Y requires suites argument as SUITES=xyz,abc,... (where suite xyz corresponds to file suite_xyz.xml))
endif
# Process make options for CCPP build
ifneq (,$(findstring SUITES=,$(FV3_MAKEOPT)))
# Extract name of suite definition files using sed:
# - remove everything leading up to the name of the suite definition file
# - remove everything following the name of the suite definition file
SUITES = $(shell echo $(FV3_MAKEOPT) | sed 's/.* SUITES=//' | sed 's/ .*//')
override CCPP_CONFOPT += --suites=$(SUITES)
else
$(error Required suites argument missing: SUITES=xyz,abc,... (where suite xyz corresponds to file suite_xyz.xml))
endif

# Make sure the expected directories exist and are non-empty:
Expand Down