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

Unified Diff: third_party/class-dump/class-dump.gyp

Issue 1171203004: Correct iOS build for latest Xcode beta. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UNAVAILABLE_ATTRIBUTE->NS_UNAVAILABLE Created 5 years, 6 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
« testing/iossim/iossim.mm ('K') | « testing/iossim/iossim.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/class-dump/class-dump.gyp
diff --git a/third_party/class-dump/class-dump.gyp b/third_party/class-dump/class-dump.gyp
index 68dec196e9c3e1ae536d2d55498ea373fee0fda5..9b3a06ce2e8699c55fd23ddc6fb89fc812957cfe 100644
--- a/third_party/class-dump/class-dump.gyp
+++ b/third_party/class-dump/class-dump.gyp
@@ -171,9 +171,24 @@
'src/Source/NSString-CDExtensions.m',
'src/Source/cd_objc2.h',
],
+ 'variables': {
+ 'developer_dir': '<!(xcode-select -print-path)',
+ 'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print $2}\')',
sdefresne 2015/06/10 16:15:56 xcodebuild -version | awk '/Xcode/ {print $2}'
justincohen 2015/06/10 16:33:36 Done.
+ },
+ 'conditions': [
+ ['xcode_version>="7.0"', {
+ 'variables': {
+ 'dynamic_library_extension': 'tbd',
+ },
+ }, { # else: xcode_version<"7.0"
+ 'variables': {
+ 'dynamic_library_extension': 'dylib',
+ },
+ }]
+ ],
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
- '$(SDKROOT)/usr/lib/libcrypto.dylib',
+ '$(SDKROOT)/usr/lib/libcrypto.<(dynamic_library_extension)',
],
'include_dirs': [
'src/Source',
« testing/iossim/iossim.mm ('K') | « testing/iossim/iossim.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698