From 87a2c3f4b4907a5496dbc44713043474e5ffd513 Mon Sep 17 00:00:00 2001
From: "jshin@chromium.org"
<jshin@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Wed, 30 Apr 2014 08:59:20 +0000
Subject: [PATCH] Enable x64 build of host toolset in icu52
Port the icu46 gyp file change to icu52.
See https://codereview.chromium.org/212593002
BUG=346626,132145
R=torne@chromium.org
TBR=torne@chromium.org
Review URL: https://codereview.chromium.org/257303002
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/icu52@267148 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
icu.gyp | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/icu.gyp b/icu.gyp
index 53a4873e0..018a2af77 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -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 '
--
GitLab