diff options
| author |  mtklein <mtklein@chromium.org> | 2015-07-13 08:13:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-13 08:13:03 -0700 |
| commit | 24d8249638706acc28b32959aa7b093cf356f38a (patch) | |
| tree | 8aad873835df7eb54c10009eb70f7774b3aa2f78 /gyp | |
| parent | 1c735488cbec9abdb25c9a12e0c11af9c302a776 (diff) | |
Tweak GYP to also link with XCode 7.
Using the XCode 7 beta, the file in the GYP doesn't exist, instead we get
/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/lib/libz.tbd
which is a text file describing libz and pointing to /usr/lib/libz.1.dylib.
There's a weird easy fix, which is that GYP looks for things in libraries like 'libz.dylib' and pattern match translates that to '-lz' on the command line. (Infuriatingly, a literal '-lz' is interpreted as a file path...)
BUG=skia:
Review URL: https://codereview.chromium.org/1234493002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/zlib.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp index 7ae62309d2..1a79715f9e 100644 --- a/gyp/zlib.gyp +++ b/gyp/zlib.gyp @@ -30,8 +30,8 @@ 'conditions': [ [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }], [ 'skia_os == "mac" or skia_os == "ios"', { - # XCode needs and explicit file path, not a logical name like -lz. - 'link_settings': { 'libraries': [ '$(SDKROOT)/usr/lib/libz.dylib' ] }, + # XCode needs a full library name, not -lz. + 'link_settings': { 'libraries': [ 'libz.dylib' ] }, }], [ 'skia_os not in ["mac", "ios", "win"]',{ 'link_settings': { 'libraries': [ '-lz' ] }, |