Skip to content

Commit 980659a

Browse files
steve-sansalond
authored andcommitted
mx_copylib: allow to pick different than the default version of a library
(cherry picked from commit 7f68a62)
1 parent 53b46ca commit 980659a

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

ci_common/common.hocon

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ environmentDarwin : {
6666
PATH : "/usr/local/bin:$JAVA_HOME/bin:$PATH"
6767
F77: "/usr/local/bin/gfortran-4.9"
6868
TZDIR: "/usr/share/zoneinfo"
69+
FASTR_LIBZ_VER: "1.2.11"
6970
}
7071
}
7172

mx.fastr/mx_copylib.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ def copylib(args):
111111
parts = os.environ['PKG_LDFLAGS_OVERRIDE'].split(' ')
112112
ext = 'dylib' if platform.system() == 'Darwin' else 'so'
113113
lib_prefix = 'lib' + args[0] + '.'
114+
ver_env_key = 'FASTR_LIB' + args[0].upper() + '_VER'
115+
if os.environ.has_key(ver_env_key):
116+
lib_prefix += os.environ[ver_env_key] + '.'
114117
plain_libpath_base = lib_prefix + ext
115118
for part in parts:
116119
path = part.strip('"').lstrip('-L')

0 commit comments

Comments
 (0)