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

Unified Diff: icu.gyp

Issue 212593002: Enable x64 build of host toolset (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu46@master
Patch Set: Add arm64 and mipsel64 Created 6 years, 9 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: icu.gyp
diff --git a/icu.gyp b/icu.gyp
index 5c175c33c576be05a9d4e4ddffff11cc4a59a896..90906078ef444f8e32f057d1363a36f851ae8b00 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -43,6 +43,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',
@@ -94,7 +109,7 @@
'sources/': [['exclude', 'icudt46l_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"', {
@@ -120,7 +135,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