|
270
by Chris Coulson
Make sure patch descriptions are up to date |
1 |
# Description: Don't pass -m32 to the host compiler on ARM builds in ICU code |
2 |
# Author: Chris Coulson <chris.coulson@canonical.com> |
|
|
269
by Chris Coulson
Fix the icu build on ARM |
3 |
|
4 |
diff --git a/third_party/icu/icu.gyp b/third_party/icu/icu.gyp
|
|
5 |
--- a/third_party/icu/icu.gyp
|
|
6 |
+++ b/third_party/icu/icu.gyp
|
|
|
440
by Chris Coulson
Update to Chromium 35.0.1908.4 |
7 |
@@ -29,18 +29,21 @@
|
|
269
by Chris Coulson
Fix the icu build on ARM |
8 |
], |
9 |
}], |
|
10 |
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
|
|
440
by Chris Coulson
Update to Chromium 35.0.1908.4 |
11 |
or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ |
|
269
by Chris Coulson
Fix the icu build on ARM |
12 |
(target_arch=="arm" or target_arch=="ia32" or \ |
13 |
target_arch=="mipsel")', {
|
|
14 |
'target_conditions': [ |
|
15 |
['_toolset=="host"', {
|
|
16 |
- 'cflags': [ '-m32' ],
|
|
17 |
- 'ldflags': [ '-m32' ],
|
|
18 |
+ 'variables': {
|
|
19 |
+ 'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',
|
|
20 |
+ },
|
|
21 |
+ 'cflags': [ '<(m32flag)' ],
|
|
22 |
+ 'ldflags': [ '<(m32flag)' ],
|
|
23 |
'asflags': [ '-32' ], |
|
24 |
'xcode_settings': {
|
|
25 |
'ARCHS': [ 'i386' ], |
|
26 |
}, |
|
27 |
}], |
|
28 |
], |
|
29 |
}], |
|
|
520
by Chris Coulson
Update to Chromium 36.0.1941.0 |
30 |
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |