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

Unified Diff: gyp/zlib.gyp

Issue 1234493002: Tweak GYP to also link with XCode 7. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Maybe this works? Created 5 years, 5 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 7ae62309d25f50939ebe924c940c94491fd9b5a8..1a79715f9eb2563a2efd3983f5b1a48e0ebbb7be 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' ] },
« 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