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

Unified Diff: build/standalone.gypi

Issue 1680943003: Support pdfium compilation with xcode 10.11 and higher (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: address comment and rebase Created 4 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 | « build/gyp/tools/mac_find_sdk.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index f0ab3a95671826b2f5bce12dbbf03fcc007df54b..dfd56176835230ae5ab7b9bd5cf5e22120b6fdfb 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -416,6 +416,15 @@
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
}],
], # target_conditions
+ 'variables': {
+ 'mac_sdk_min': '10.10',
+ 'mac_sdk%': '<!(python <(DEPTH)/build/gyp/tools/mac_find_sdk.py <(mac_sdk_min))',
+ },
+ 'xcode_settings': {
+ 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
+ # See comment in Chromium's common.gypi for why this is needed.
+ 'SYMROOT': '<(DEPTH)/xcodebuild',
+ },
}], # OS=="mac"
['v8_use_external_startup_data==1', {
'defines': [
@@ -432,11 +441,6 @@
}],
],
},
- 'xcode_settings': {
- 'SDKROOT': 'macosx10.10', # -isysroot
- # See comment in Chromium's common.gypi for why this is needed.
- 'SYMROOT': '<(DEPTH)/xcodebuild',
- },
'conditions': [
['OS=="linux" or OS=="mac"', {
'conditions': [
« no previous file with comments | « build/gyp/tools/mac_find_sdk.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698