Commit b8e8905b authored by Piotr Sikora's avatar Piotr Sikora Committed by V8 LUCI CQ

[bazel] Use bazel/config from within the main repository.

There is no reason for bazel/config to be used as an external dependency
(we can replace "@v8//bazel/config" as easily as "@config") and it makes
integration with other Bazel workspaces much harded than it needs to be.
Signed-off-by: 's avatarPiotr Sikora <piotrsikora@google.com>
Change-Id: Idb818c3237d6840ebaa1dfc85b8be686b06d8a2f
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3331591Reviewed-by: 's avatarVictor Gomes <victorgomes@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78486}
parent c9558bd6
This diff is collapsed.
...@@ -16,12 +16,6 @@ http_archive( ...@@ -16,12 +16,6 @@ http_archive(
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
bazel_skylib_workspace() bazel_skylib_workspace()
new_local_repository(
name = "config",
path = "bazel/config",
build_file = "bazel/config/BUILD.bazel",
)
new_local_repository( new_local_repository(
name = "zlib", name = "zlib",
path = "third_party/zlib", path = "third_party/zlib",
......
...@@ -89,7 +89,7 @@ def _default_args(): ...@@ -89,7 +89,7 @@ def _default_args():
return struct( return struct(
deps = [":define_flags"], deps = [":define_flags"],
defines = select({ defines = select({
"@config//:is_windows": [ "@v8//bazel/config:is_windows": [
"UNICODE", "UNICODE",
"_UNICODE", "_UNICODE",
"_CRT_RAND_S", "_CRT_RAND_S",
...@@ -98,7 +98,7 @@ def _default_args(): ...@@ -98,7 +98,7 @@ def _default_args():
"//conditions:default": [], "//conditions:default": [],
}), }),
copts = select({ copts = select({
"@config//:is_posix": [ "@v8//bazel/config:is_posix": [
"-fPIC", "-fPIC",
"-Werror", "-Werror",
"-Wextra", "-Wextra",
...@@ -115,12 +115,12 @@ def _default_args(): ...@@ -115,12 +115,12 @@ def _default_args():
}), }),
includes = ["include"], includes = ["include"],
linkopts = select({ linkopts = select({
"@config//:is_windows": [ "@v8//bazel/config:is_windows": [
"Winmm.lib", "Winmm.lib",
"DbgHelp.lib", "DbgHelp.lib",
"Advapi32.lib", "Advapi32.lib",
], ],
"@config//:is_macos": ["-pthread"], "@v8//bazel/config:is_macos": ["-pthread"],
"//conditions:default": ["-Wl,--no-as-needed -ldl -pthread"], "//conditions:default": ["-Wl,--no-as-needed -ldl -pthread"],
}) + select({ }) + select({
":should_add_rdynamic": ["-rdynamic"], ":should_add_rdynamic": ["-rdynamic"],
...@@ -313,7 +313,7 @@ def v8_torque(name, noicu_srcs, icu_srcs, args, extras): ...@@ -313,7 +313,7 @@ def v8_torque(name, noicu_srcs, icu_srcs, args, extras):
args = args, args = args,
extras = extras, extras = extras,
tool = select({ tool = select({
"@config//:v8_target_is_32_bits": ":torque_non_pointer_compression", "@v8//bazel/config:v8_target_is_32_bits": ":torque_non_pointer_compression",
"//conditions:default": ":torque", "//conditions:default": ":torque",
}), }),
) )
...@@ -324,7 +324,7 @@ def v8_torque(name, noicu_srcs, icu_srcs, args, extras): ...@@ -324,7 +324,7 @@ def v8_torque(name, noicu_srcs, icu_srcs, args, extras):
args = args, args = args,
extras = extras, extras = extras,
tool = select({ tool = select({
"@config//:v8_target_is_32_bits": ":torque_non_pointer_compression", "@v8//bazel/config:v8_target_is_32_bits": ":torque_non_pointer_compression",
"//conditions:default": ":torque", "//conditions:default": ":torque",
}), }),
) )
...@@ -343,14 +343,14 @@ def _v8_target_cpu_transition_impl(settings, attr): ...@@ -343,14 +343,14 @@ def _v8_target_cpu_transition_impl(settings, attr):
"armeabi-v7a": "arm32", "armeabi-v7a": "arm32",
} }
v8_target_cpu = mapping[settings["//command_line_option:cpu"]] v8_target_cpu = mapping[settings["//command_line_option:cpu"]]
return {"@config//:v8_target_cpu": v8_target_cpu} return {"@v8//bazel/config:v8_target_cpu": v8_target_cpu}
# Set the v8_target_cpu to be the correct architecture given the cpu specified # Set the v8_target_cpu to be the correct architecture given the cpu specified
# on the command line. # on the command line.
v8_target_cpu_transition = transition( v8_target_cpu_transition = transition(
implementation = _v8_target_cpu_transition_impl, implementation = _v8_target_cpu_transition_impl,
inputs = ["//command_line_option:cpu"], inputs = ["//command_line_option:cpu"],
outputs = ["@config//:v8_target_cpu"], outputs = ["@v8//bazel/config:v8_target_cpu"],
) )
def _mksnapshot(ctx): def _mksnapshot(ctx):
......
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