diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2008-08-21 02:51:33 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2008-08-21 02:51:33 (GMT) |
| commit | c61fc49251415cb840710668155df5f4bfc28a62 (patch) | |
| tree | 29c44abd1c1f091f82b25fa3365335580bfc184e /src/engine | |
| parent | b2267bc38858064d997e068026cc717eb2a9add5 (diff) | |
| download | SCons-c61fc49251415cb840710668155df5f4bfc28a62.zip SCons-c61fc49251415cb840710668155df5f4bfc28a62.tar.gz SCons-c61fc49251415cb840710668155df5f4bfc28a62.tar.bz2 | |
Fix issue 2127 (missing FRAMEWORKSFLAGS in applelink.py) by adding them in a couple of lines. FRAMEWORKSFLAGS is an older flag set largely superseded by FRAMEWORKPATH and FRAMEWORKS, but still may be used.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Tool/applelink.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/applelink.py b/src/engine/SCons/Tool/applelink.py index 7500133..0a7a185 100644 --- a/src/engine/SCons/Tool/applelink.py +++ b/src/engine/SCons/Tool/applelink.py @@ -47,9 +47,9 @@ def generate(env): env['FRAMEWORKPATHPREFIX'] = '-F' env['_FRAMEWORKPATH'] = '${_concat(FRAMEWORKPATHPREFIX, FRAMEWORKPATH, "", __env__)}' env['_FRAMEWORKS'] = '${_concat("-framework ", FRAMEWORKS, "", __env__)}' - env['LINKCOM'] = env['LINKCOM'] + ' $_FRAMEWORKPATH $_FRAMEWORKS' + env['LINKCOM'] = env['LINKCOM'] + ' $_FRAMEWORKPATH $_FRAMEWORKS $FRAMEWORKSFLAGS' env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -dynamiclib') - env['SHLINKCOM'] = env['SHLINKCOM'] + ' $_FRAMEWORKPATH $_FRAMEWORKS' + env['SHLINKCOM'] = env['SHLINKCOM'] + ' $_FRAMEWORKPATH $_FRAMEWORKS $FRAMEWORKSFLAGS' # override the default for loadable modules, which are different # on OS X than dynamic shared libs. echoing what XCode does for |