diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-12-05 04:06:54 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-12-05 04:06:54 (GMT) |
| commit | aa9a278fde5d99bb8aabad1e32fbb99a75bda6c8 (patch) | |
| tree | 28827d66f73a33896d30e03b8788f76b6c3e28aa /src/engine/SCons | |
| parent | 2b978d126393723def974e48fec0f7fffcd5743e (diff) | |
| download | SCons-aa9a278fde5d99bb8aabad1e32fbb99a75bda6c8.zip SCons-aa9a278fde5d99bb8aabad1e32fbb99a75bda6c8.tar.gz SCons-aa9a278fde5d99bb8aabad1e32fbb99a75bda6c8.tar.bz2 | |
Fix flag usage for APPLELINK_CURRENT_VERSION and APPLELINK_COMPATIBILITY_VERSION in generator logic
Diffstat (limited to 'src/engine/SCons')
| -rw-r--r-- | src/engine/SCons/Tool/applelink.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/engine/SCons/Tool/applelink.py b/src/engine/SCons/Tool/applelink.py index 4a87a07..afe766e 100644 --- a/src/engine/SCons/Tool/applelink.py +++ b/src/engine/SCons/Tool/applelink.py @@ -81,12 +81,13 @@ def _applelib_currentVersionFromSoVersion(source, target, env, for_signature): """ if env.get('APPLELINK_CURRENT_VERSION', False): - version_string = env['SHLIBVERSION'] + version_string = env['APPLELINK_CURRENT_VERSION'] elif env.get('SHLIBVERSION', False): version_string = env['SHLIBVERSION'] else: return "" + print("Versino_String:%s"%version_string) version_string = ".".join(version_string.split('.')[:3]) return "-Wl,-current_version,%s" % version_string @@ -97,8 +98,8 @@ def _applelib_compatVersionFromSoVersion(source, target, env, for_signature): -Wl,compat_version=2.0 """ - if env.get('APPLELINK_COMPAT_VERSION', False): - version_string = env['SHLIBVERSION'] + if env.get('APPLELINK_COMPATIBILITY_VERSION', False): + version_string = env['APPLELINK_COMPATIBILITY_VERSION'] elif env.get('SHLIBVERSION', False): version_string = ".".join(env['SHLIBVERSION'].split('.')[:2] + ['0']) else: @@ -132,10 +133,10 @@ def generate(env): env['LINKCALLBACKS']['VersionedShLibSoname'] = _applelib_versioned_shlib_soname - env['APPLELINK_CURRENT_VERSION'] = _applelib_currentVersionFromSoVersion - env['APPLELINK_COMPATIBILITY_VERSION'] = _applelib_compatVersionFromSoVersion - env['_SHLIBVERSIONFLAGS'] = '$APPLELINK_CURRENT_VERSION $APPLELINK_COMPATIBILITY_VERSION ' - env['_LDMODULEVERSIONFLAGS'] = '$APPLELINK_CURRENT_VERSION $APPLELINK_COMPATIBILITY_VERSION ' + env['_APPLELINK_CURRENT_VERSION'] = _applelib_currentVersionFromSoVersion + env['_APPLELINK_COMPATIBILITY_VERSION'] = _applelib_compatVersionFromSoVersion + env['_SHLIBVERSIONFLAGS'] = '$_APPLELINK_CURRENT_VERSION $_APPLELINK_COMPATIBILITY_VERSION ' + env['_LDMODULEVERSIONFLAGS'] = '$_APPLELINK_CURRENT_VERSION $_APPLELINK_COMPATIBILITY_VERSION ' # override the default for loadable modules, which are different # on OS X than dynamic shared libs. echoing what XCode does for |