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

Unified Diff: icu52/icu.gyp

Issue 257303002: Enable x64 build of host toolset in icu52 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 6 years, 8 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: icu52/icu.gyp
===================================================================
--- icu52/icu.gyp (revision 266957)
+++ icu52/icu.gyp (working copy)
@@ -44,6 +44,21 @@
}],
],
}],
+ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
+ (target_arch=="arm64" or target_arch=="x64" or \
+ target_arch=="mipsel64")', {
+ 'target_conditions': [
+ ['_toolset=="host"', {
+ 'cflags': [ '-m64' ],
+ 'ldflags': [ '-m64' ],
+ 'asflags': [ '-64' ],
+ 'xcode_settings': {
+ 'ARCHS': [ 'x86_64' ],
+ },
+ }],
+ ],
+ }],
],
'include_dirs': [
'source/common',
@@ -95,7 +110,7 @@
'sources/': [['exclude', 'icudtl_dat']],
# Compile in the stub data symbol.
'sources': ['source/stubdata/stubdata.c'],
-
+
# Make sure any binary depending on this gets the data file.
'conditions': [
['OS != "ios"', {
@@ -121,7 +136,7 @@
},
}], # OS!=ios
], # conditions
- }], # icu_use_data_file_flag
+ }], # icu_use_data_file_flag
], # conditions
'target_conditions': [
[ 'OS == "win" or OS == "mac" or OS == "ios" or '
« 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