diff options
| author | dpranke <dpranke@chromium.org> | 2015-02-19 16:16:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 00:16:56 +0000 |
| commit | 7ee02bed35766535521c8e1f072b98cbf9eef53d (patch) | |
| tree | cebe39f97b38fe060104b93abc7e75ce52ec2cb1 /build/toolchain/cros/BUILD.gn | |
| parent | a57830437741d839456f92f1bb8c69d088984842 (diff) | |
| download | chromium_src-7ee02bed35766535521c8e1f072b98cbf9eef53d.zip chromium_src-7ee02bed35766535521c8e1f072b98cbf9eef53d.tar.gz chromium_src-7ee02bed35766535521c8e1f072b98cbf9eef53d.tar.bz2 | |
Roll GN binaries to #317120 for the cpu_arch changes
The newest version of GN replaces the 'cpu_arch' and 'os' variables with 'current_cpu', 'target_cpu', 'current_os', and 'target_os', and also replaces 'build_cpu' with 'host_cpu', and 'build_os' with 'host_os'.
The roll also picks up the change to add a new 'gn clean'
command, some absolute path handling fixes, a check_includes fix for action_foreach(), and some minor
internal fixes.
This patch also updates the build config files to accommodate the GN changes in a backwards-compatible manner, i.e., the configs now will set cpu_arch and os correctly in the right contexts. They will also allow the users to continue to set os= and cpu_arch= in an args file, so no user builds (or bots) will break.
Once all of the bots and all of the build files have been updated to refer to the new variables instead of the old ones, we can drop the backwards-compatible versions.
TBR=brettw@chromium.org
BUG=344767
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
Review URL: https://codereview.chromium.org/936103003
Cr-Commit-Position: refs/heads/master@{#317186}
Diffstat (limited to 'build/toolchain/cros/BUILD.gn')
| -rw-r--r-- | build/toolchain/cros/BUILD.gn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/toolchain/cros/BUILD.gn b/build/toolchain/cros/BUILD.gn index d360f72..140958b 100644 --- a/build/toolchain/cros/BUILD.gn +++ b/build/toolchain/cros/BUILD.gn @@ -29,7 +29,7 @@ gcc_toolchain("target") { ar = "${cros_target_ar}" ld = cxx - toolchain_cpu_arch = "${cpu_arch}" + toolchain_cpu = "${target_cpu}" toolchain_os = "linux" is_clang = is_clang } |