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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gypfiles/toolchain.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 6f1aaaff02c6a71a7b884bf182d7f928baaca703..38ac768786476006948521a1c3943bb126db2f8b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -64,6 +64,7 @@ declare_args() {
}
v8_random_seed = "314159265"
+v8_toolset_for_d8 = "host"
v8_toolset_for_shell = "host"
if (is_msan) {
@@ -2065,44 +2066,48 @@ if (is_component_build) {
}
}
-executable("d8") {
- sources = [
- "src/d8.cc",
- "src/d8.h",
- ]
+if ((current_toolchain == host_toolchain && v8_toolset_for_d8 == "host") ||
+ (current_toolchain == snapshot_toolchain && v8_toolset_for_d8 == "host") ||
+ (current_toolchain != host_toolchain && v8_toolset_for_d8 == "target")) {
+ executable("d8") {
+ sources = [
+ "src/d8.cc",
+ "src/d8.h",
+ ]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
- configs += [
- # Note: don't use :internal_config here because this target will get
- # the :external_config applied to it by virtue of depending on :v8, and
- # you can't have both applied to the same target.
- ":internal_config_base",
- ":features",
- ":toolchain",
- ]
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+ configs += [
+ # Note: don't use :internal_config here because this target will get
+ # the :external_config applied to it by virtue of depending on :v8, and
+ # you can't have both applied to the same target.
+ ":internal_config_base",
+ ":features",
+ ":toolchain",
+ ]
- deps = [
- ":d8_js2c",
- ":v8",
- ":v8_libplatform",
- "//build/config/sanitizers:deps",
- "//build/win:default_exe_manifest",
- ]
+ deps = [
+ ":d8_js2c",
+ ":v8",
+ ":v8_libplatform",
+ "//build/config/sanitizers:deps",
+ "//build/win:default_exe_manifest",
+ ]
- # TODO(jochen): Add support for vtunejit.
+ # TODO(jochen): Add support for vtunejit.
- if (is_posix) {
- sources += [ "src/d8-posix.cc" ]
- } else if (is_win) {
- sources += [ "src/d8-windows.cc" ]
- }
+ if (is_posix) {
+ sources += [ "src/d8-posix.cc" ]
+ } else if (is_win) {
+ sources += [ "src/d8-windows.cc" ]
+ }
- if (!is_component_build) {
- sources += [ "$target_gen_dir/d8-js.cc" ]
- }
- if (v8_enable_i18n_support) {
- deps += [ "//third_party/icu" ]
+ if (!is_component_build) {
+ sources += [ "$target_gen_dir/d8-js.cc" ]
+ }
+ if (v8_enable_i18n_support) {
+ deps += [ "//third_party/icu" ]
+ }
}
}
« 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