| OLD | NEW |
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/compiler/compiler.gni") | 5 import("//build/config/compiler/compiler.gni") |
| 6 import("//build/config/sysroot.gni") | 6 import("//build/config/sysroot.gni") |
| 7 import("//build/toolchain/gcc_toolchain.gni") | 7 import("//build/toolchain/gcc_toolchain.gni") |
| 8 import("//build/toolchain/cros_toolchain.gni") | 8 import("//build/toolchain/cros_toolchain.gni") |
| 9 | 9 |
| 10 # TODO(dpranke): Delete this after we get rid of the reference to | 10 # TODO(dpranke): Delete this after we get rid of the reference to |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 extra_ldflags = cros_v8_snapshot_extra_ldflags | 120 extra_ldflags = cros_v8_snapshot_extra_ldflags |
| 121 | 121 |
| 122 # These are passed through as toolchain_args. | 122 # These are passed through as toolchain_args. |
| 123 cc_wrapper = "" | 123 cc_wrapper = "" |
| 124 is_clang = cros_v8_snapshot_is_clang | 124 is_clang = cros_v8_snapshot_is_clang |
| 125 if (target_cpu == "x86" || target_cpu == "arm" || target_cpu == "mipsel") { | 125 if (target_cpu == "x86" || target_cpu == "arm" || target_cpu == "mipsel") { |
| 126 toolchain_cpu = "x86" | 126 toolchain_cpu = "x86" |
| 127 } else { | 127 } else { |
| 128 toolchain_cpu = "x64" | 128 toolchain_cpu = "x64" |
| 129 } | 129 } |
| 130 v8_toolchain_cpu = v8_target_cpu |
| 130 toolchain_os = "linux" | 131 toolchain_os = "linux" |
| 131 use_sysroot = false | 132 use_sysroot = false |
| 132 } | 133 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2158143002:
Re-land r405933 w/ fix for CrOS. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master