Commit dbe9457f authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

[jumbo]: allow cctest jumbo mode builds

There is no jumbo_executable target atm, so split the cctest v8_executable
target into cctest and cctest_sources.

Bug: chromium:746958
Change-Id: Iec0956234d026039c4d29921170dd2f0955222ca
Reviewed-on: https://chromium-review.googlesource.com/680575Reviewed-by: 's avatarJakob Kummerow <jkummerow@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@opera.com>
Cr-Commit-Position: refs/heads/master@{#48147}
parent 72484a6a
...@@ -6,6 +6,34 @@ import("../../gni/v8.gni") ...@@ -6,6 +6,34 @@ import("../../gni/v8.gni")
v8_executable("cctest") { v8_executable("cctest") {
testonly = true testonly = true
deps = [
":cctest_sources",
]
configs = [
"../..:external_config",
"../..:internal_config_base",
]
ldflags = []
# TODO(machenbach): Translate from gyp.
#["OS=="aix"", {
# "ldflags": [ "-Wl,-bbigtoc" ],
#}],
# crbug.com/676417: Suppress symbol import warning from linker.
if (is_win && is_component_build) {
ldflags += [
"/ignore:4217",
"/ignore:4049",
]
remove_configs = [ "//build/config/win:default_incremental_linking" ]
configs += [ "//build/config/win:no_incremental_linking" ]
}
}
v8_source_set("cctest_sources") {
testonly = true
sources = [ sources = [
"$target_gen_dir/resources.cc", "$target_gen_dir/resources.cc",
...@@ -209,6 +237,17 @@ v8_executable("cctest") { ...@@ -209,6 +237,17 @@ v8_executable("cctest") {
"wasm/wasm-run-utils.h", "wasm/wasm-run-utils.h",
] ]
if (use_jumbo_build) {
jumbo_excluded_sources = [
# TODO(mostynb@opera.com): figure out the jumbo issues with these source
# files, and include them in jumbo compilation units.
"interpreter/bytecode-expectations-printer.cc",
"interpreter/bytecode-expectations-printer.h",
"test-api.cc",
"test-api.h",
]
}
if (v8_current_cpu == "arm") { if (v8_current_cpu == "arm") {
sources += [ ### gcmole(arch:arm) ### sources += [ ### gcmole(arch:arm) ###
"test-assembler-arm.cc", "test-assembler-arm.cc",
...@@ -320,12 +359,7 @@ v8_executable("cctest") { ...@@ -320,12 +359,7 @@ v8_executable("cctest") {
"../..:internal_config_base", "../..:internal_config_base",
] ]
# TODO(machenbach): Translate from gyp. public_deps = [
#["OS=="aix"", {
# "ldflags": [ "-Wl,-bbigtoc" ],
#}],
deps = [
":resources", ":resources",
"../..:v8_initializers", "../..:v8_initializers",
"../..:v8_libbase", "../..:v8_libbase",
...@@ -336,6 +370,7 @@ v8_executable("cctest") { ...@@ -336,6 +370,7 @@ v8_executable("cctest") {
] ]
defines = [] defines = []
deps = []
if (is_component_build) { if (is_component_build) {
# cctest can't be built against a shared library, so we # cctest can't be built against a shared library, so we
...@@ -353,18 +388,6 @@ v8_executable("cctest") { ...@@ -353,18 +388,6 @@ v8_executable("cctest") {
} }
cflags = [] cflags = []
ldflags = []
# crbug.com/676417: Suppress symbol import warning from linker.
if (is_win && is_component_build) {
ldflags += [
"/ignore:4217",
"/ignore:4049",
]
remove_configs = [ "//build/config/win:default_incremental_linking" ]
configs += [ "//build/config/win:no_incremental_linking" ]
}
if (v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || if (v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
v8_current_cpu == "arm" || v8_current_cpu == "arm64" || v8_current_cpu == "arm" || v8_current_cpu == "arm64" ||
v8_current_cpu == "s390" || v8_current_cpu == "s390x" || v8_current_cpu == "s390" || v8_current_cpu == "s390x" ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment