diff options
| author |  mtklein <mtklein@chromium.org> | 2015-02-18 09:35:49 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-18 09:35:49 -0800 |
| commit | 4c7a8b04a09a6b9558a8ffcfbd311c0681ab5df1 (patch) | |
| tree | 5aa6b80a849e68507ef98b0b4c5d61d06dc48b34 | |
| parent | e4ef1ca5be11aed67c0ed0c7eb1862696fb063e3 (diff) | |
fix xcode build
NOTREECHECKS=true
BUG=skia:
Review URL: https://codereview.chromium.org/936033003
| -rw-r--r-- | gyp/zlib.gyp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp index a573dc7498..e2424db389 100644 --- a/gyp/zlib.gyp +++ b/gyp/zlib.gyp @@ -7,10 +7,15 @@ 'targets': [{ 'target_name': 'zlib', 'type': 'none', - 'link_settings': { 'libraries': [ '-lz' ] }, 'direct_dependent_settings': { 'conditions': [ - [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }] + [ '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' ] }, + },{ + 'link_settings': { 'libraries': [ '-lz' ] }, + }] ], }, }], |