Skip to content

Commit

Permalink
Merge pull request ESCOMP#17 from ESCOMP/buildlib_update
Browse files Browse the repository at this point in the history
update buildlib for upcoming cime/master
  • Loading branch information
dabail10 authored Mar 21, 2019
2 parents bd8d710 + 494f53f commit fff1934
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions cime_config/buildlib
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ from standard_script_setup import *
from CIME.case import Case
from CIME.utils import expect, run_cmd
from CIME.buildlib import parse_input
from CIME.build import get_standard_makefile_args

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -57,8 +58,8 @@ def _build_cice():
complib = os.path.join(libroot,"libice.a")
makefile = os.path.join(casetools, "Makefile")

cmd = "%s complib -j %d MODEL=cice COMPLIB=%s -f %s USER_CPPDEFS=\"%s\"" \
% (gmake, gmake_j, complib, makefile, cice_cppdefs )
cmd = "{} complib -j {} MODEL=cice COMPLIB={} -f {} USER_CPPDEFS=\"{}\" {} " \
.format(gmake, gmake_j, complib, makefile, cice_cppdefs, get_standard_makefile_args(case))

rc, out, err = run_cmd(cmd, from_dir=bldroot)
expect(rc == 0, "Command %s failed rc=%d\nout=%s\nerr=%s" % (cmd, rc, out, err))
Expand Down

0 comments on commit fff1934

Please sign in to comment.