Skip to content

Commit

Permalink
Merge pull request #13 from ESCOMP/buildlib_update
Browse files Browse the repository at this point in the history
Buildlib update
  • Loading branch information
ekluzek authored Jun 12, 2019
2 parents 3ac4042 + 3d7b62c commit cd4d6f9
Show file tree
Hide file tree
Showing 2 changed files with 15 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 @@ -15,6 +15,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 @@ -47,8 +48,8 @@ def _build_rtm():
complib = os.path.join(libroot, "librof.a")
makefile = os.path.join(casetools, "Makefile")

cmd = "%s complib -j %d MODEL=rtm COMPLIB=%s -f %s" \
% (gmake, gmake_j, complib, makefile)
cmd = "{} complib -j {} MODEL=rtm COMPLIB={} -f {} {}" \
.format(gmake, gmake_j, complib, makefile, 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
12 changes: 12 additions & 0 deletions docs/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
===============================================================
Tag name: rtm1_0_68
Originator(s): erik
Date: Jun 11, 2019
One-line Summary: buildlib changes to be compatable with cime5.8

buildlib changes from @jedwards to be compatable with cime5.8.
Ran testing with cime tag branch_tags/cime5.8.3_chint17-02.

Testing:
rtm testlist on hobart and cheyenne (PASS)

===============================================================
Tag name: rtm1_0_67
Originator(s): erik
Expand Down

0 comments on commit cd4d6f9

Please sign in to comment.