summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authortorne <torne@chromium.org>2014-08-28 11:28:17 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-28 18:33:10 +0000
commited51a58fb7366557e5dc3b874aa9821d8c5d5343 (patch)
tree72a25687f3ad897d31c04d853631b4c5b3f0b2c9 /build
parente3b7da9e87ee035c2c4529ccbfe541a7ffebd077 (diff)
downloadchromium_src-ed51a58fb7366557e5dc3b874aa9821d8c5d5343.zip
chromium_src-ed51a58fb7366557e5dc3b874aa9821d8c5d5343.tar.gz
chromium_src-ed51a58fb7366557e5dc3b874aa9821d8c5d5343.tar.bz2
Update host compiler version info for android webview.
The android webview build now uses clang when building for host; update the gyp variables appropriately to make sure we use reasonable compiler flags. BUG=377684 Review URL: https://codereview.chromium.org/516723004 Cr-Commit-Position: refs/heads/master@{#292418}
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi23
1 files changed, 6 insertions, 17 deletions
diff --git a/build/common.gypi b/build/common.gypi
index ea388ac7..188b1ac 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -627,15 +627,11 @@
# build only explicitly selected platforms.
'ozone_auto_platforms%': 1,
+ # If this is set clang is used as host compiler, but not as target
+ # compiler. Always do this by default.
+ 'host_clang%': 1,
+
'conditions': [
- ['android_webview_build==0', {
- # If this is set clang is used as host compiler, but not as target
- # compiler. Always do this by default, except when building for AOSP.
- 'host_clang%': 1,
- }, {
- # See http://crbug.com/377684
- 'host_clang%': 0,
- }],
# A flag for POSIX platforms
['OS=="win"', {
'os_posix%': 0,
@@ -1547,15 +1543,8 @@
'gcc_version%': '<!pymod_do_main(compiler_version target compiler)',
}],
['android_webview_build==1', {
- # Android WebView uses a hermetic toolchain even for host, so set it
- # manually here.
- 'conditions': [
- ['host_os=="mac"', {
- 'host_gcc_version%': 42,
- }, { # linux
- 'host_gcc_version%': 46,
- }],
- ],
+ # Android WebView uses a hermetic clang toolchain for host builds.
+ 'host_gcc_version%': 0,
}, { # android_webview_build!=1
'host_gcc_version%': '<!pymod_do_main(compiler_version host compiler)',
}],