Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(500)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/zlib.gyp

Issue 936033003: fix xcode build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/zlib.gyp
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp
index a573dc7498d970d83f7e35848ba709aa823cb976..e2424db38999ddf0c1182eb8e216565a5afd4956 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' ] },
+ }]
],
},
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698