Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Side by Side Diff: BUILD.gn

Issue 1974773002: Revert of Remove v8_toolset_for_d8 flag (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Now without conflicts Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | gypfiles/toolchain.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 6 import("//build/config/arm.gni")
7 import("//build/config/mips.gni") 7 import("//build/config/mips.gni")
8 import("//build/config/sanitizers/sanitizers.gni") 8 import("//build/config/sanitizers/sanitizers.gni")
9 9
10 if (is_android) { 10 if (is_android) {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 v8_postmortem_support = false 57 v8_postmortem_support = false
58 58
59 # Similar to vfp but on MIPS. 59 # Similar to vfp but on MIPS.
60 v8_can_use_fpu_instructions = true 60 v8_can_use_fpu_instructions = true
61 61
62 # Similar to the ARM hard float ABI but on MIPS. 62 # Similar to the ARM hard float ABI but on MIPS.
63 v8_use_mips_abi_hardfloat = true 63 v8_use_mips_abi_hardfloat = true
64 } 64 }
65 65
66 v8_random_seed = "314159265" 66 v8_random_seed = "314159265"
67 v8_toolset_for_d8 = "host"
67 v8_toolset_for_shell = "host" 68 v8_toolset_for_shell = "host"
68 69
69 if (is_msan) { 70 if (is_msan) {
70 # Running the V8-generated code on an ARM simulator is a powerful hack that 71 # Running the V8-generated code on an ARM simulator is a powerful hack that
71 # allows the tool to see the memory accesses from JITted code. Without this 72 # allows the tool to see the memory accesses from JITted code. Without this
72 # flag, JS code causes false positive reports from MSan. 73 # flag, JS code causes false positive reports from MSan.
73 v8_target_arch = "arm64" 74 v8_target_arch = "arm64"
74 } else { 75 } else {
75 v8_target_arch = target_cpu 76 v8_target_arch = target_cpu
76 } 77 }
(...skipping 1981 matching lines...) Expand 10 before | Expand all | Expand 10 after
2058 } else { 2059 } else {
2059 group("v8") { 2060 group("v8") {
2060 public_deps = [ 2061 public_deps = [
2061 ":v8_base", 2062 ":v8_base",
2062 snapshot_target, 2063 snapshot_target,
2063 ] 2064 ]
2064 public_configs = [ ":external_config" ] 2065 public_configs = [ ":external_config" ]
2065 } 2066 }
2066 } 2067 }
2067 2068
2068 executable("d8") { 2069 if ((current_toolchain == host_toolchain && v8_toolset_for_d8 == "host") ||
2069 sources = [ 2070 (current_toolchain == snapshot_toolchain && v8_toolset_for_d8 == "host") ||
2070 "src/d8.cc", 2071 (current_toolchain != host_toolchain && v8_toolset_for_d8 == "target")) {
2071 "src/d8.h", 2072 executable("d8") {
2072 ] 2073 sources = [
2074 "src/d8.cc",
2075 "src/d8.h",
2076 ]
2073 2077
2074 configs -= [ "//build/config/compiler:chromium_code" ] 2078 configs -= [ "//build/config/compiler:chromium_code" ]
2075 configs += [ "//build/config/compiler:no_chromium_code" ] 2079 configs += [ "//build/config/compiler:no_chromium_code" ]
2076 configs += [ 2080 configs += [
2077 # Note: don't use :internal_config here because this target will get 2081 # Note: don't use :internal_config here because this target will get
2078 # the :external_config applied to it by virtue of depending on :v8, and 2082 # the :external_config applied to it by virtue of depending on :v8, and
2079 # you can't have both applied to the same target. 2083 # you can't have both applied to the same target.
2080 ":internal_config_base", 2084 ":internal_config_base",
2081 ":features", 2085 ":features",
2082 ":toolchain", 2086 ":toolchain",
2083 ] 2087 ]
2084 2088
2085 deps = [ 2089 deps = [
2086 ":d8_js2c", 2090 ":d8_js2c",
2087 ":v8", 2091 ":v8",
2088 ":v8_libplatform", 2092 ":v8_libplatform",
2089 "//build/config/sanitizers:deps", 2093 "//build/config/sanitizers:deps",
2090 "//build/win:default_exe_manifest", 2094 "//build/win:default_exe_manifest",
2091 ] 2095 ]
2092 2096
2093 # TODO(jochen): Add support for vtunejit. 2097 # TODO(jochen): Add support for vtunejit.
2094 2098
2095 if (is_posix) { 2099 if (is_posix) {
2096 sources += [ "src/d8-posix.cc" ] 2100 sources += [ "src/d8-posix.cc" ]
2097 } else if (is_win) { 2101 } else if (is_win) {
2098 sources += [ "src/d8-windows.cc" ] 2102 sources += [ "src/d8-windows.cc" ]
2099 } 2103 }
2100 2104
2101 if (!is_component_build) { 2105 if (!is_component_build) {
2102 sources += [ "$target_gen_dir/d8-js.cc" ] 2106 sources += [ "$target_gen_dir/d8-js.cc" ]
2103 } 2107 }
2104 if (v8_enable_i18n_support) { 2108 if (v8_enable_i18n_support) {
2105 deps += [ "//third_party/icu" ] 2109 deps += [ "//third_party/icu" ]
2110 }
2106 } 2111 }
2107 } 2112 }
2108 2113
2109 if ((current_toolchain == host_toolchain && v8_toolset_for_shell == "host") || ( current_toolchain == snapshot_toolchain && v8_toolset_for_shell == "host") || (c urrent_toolchain != host_toolchain && v8_toolset_for_shell == "target")) { 2114 if ((current_toolchain == host_toolchain && v8_toolset_for_shell == "host") || ( current_toolchain == snapshot_toolchain && v8_toolset_for_shell == "host") || (c urrent_toolchain != host_toolchain && v8_toolset_for_shell == "target")) {
2110 executable("v8_shell") { 2115 executable("v8_shell") {
2111 sources = [ 2116 sources = [
2112 "samples/shell.cc", 2117 "samples/shell.cc",
2113 ] 2118 ]
2114 2119
2115 configs -= [ "//build/config/compiler:chromium_code" ] 2120 configs -= [ "//build/config/compiler:chromium_code" ]
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
2198 ] 2203 ]
2199 2204
2200 deps = [ 2205 deps = [
2201 ":fuzzer_support", 2206 ":fuzzer_support",
2202 ] 2207 ]
2203 2208
2204 configs = [ 2209 configs = [
2205 ":internal_config", 2210 ":internal_config",
2206 ] 2211 ]
2207 } 2212 }
OLDNEW
« no previous file with comments | « no previous file | gypfiles/toolchain.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698