Skip to content
Snippets Groups Projects
Commit 87a2c3f4 authored by jshin@chromium.org's avatar jshin@chromium.org
Browse files

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
parent b76b3106
No related branches found
No related tags found
No related merge requests found
...@@ -44,6 +44,21 @@ ...@@ -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': [ 'include_dirs': [
'source/common', 'source/common',
...@@ -95,7 +110,7 @@ ...@@ -95,7 +110,7 @@
'sources/': [['exclude', 'icudtl_dat']], 'sources/': [['exclude', 'icudtl_dat']],
# Compile in the stub data symbol. # Compile in the stub data symbol.
'sources': ['source/stubdata/stubdata.c'], 'sources': ['source/stubdata/stubdata.c'],
# Make sure any binary depending on this gets the data file. # Make sure any binary depending on this gets the data file.
'conditions': [ 'conditions': [
['OS != "ios"', { ['OS != "ios"', {
...@@ -121,7 +136,7 @@ ...@@ -121,7 +136,7 @@
}, },
}], # OS!=ios }], # OS!=ios
], # conditions ], # conditions
}], # icu_use_data_file_flag }], # icu_use_data_file_flag
], # conditions ], # conditions
'target_conditions': [ 'target_conditions': [
[ 'OS == "win" or OS == "mac" or OS == "ios" or ' [ 'OS == "win" or OS == "mac" or OS == "ios" or '
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment