1

downgrade bazel to 3.7.0

that's our target for now.
This commit is contained in:
Motiejus Jakštys 2021-06-28 12:52:20 +03:00
parent f094bdf879
commit be168480a7
5 changed files with 16 additions and 7 deletions

View File

@ -1 +1 @@
4.1.0 3.7.0

8
.envrc Normal file
View File

@ -0,0 +1,8 @@
export PATH="$(git rev-parse --show-toplevel)/bin:$PATH"
if [[ ! -x bin/bazel ]]; then
mkdir -p bin
wget https://github.com/bazelbuild/bazelisk/releases/download/v1.9.0/bazelisk-linux-amd64 \
-O bin/bazel
chmod a+x bin/bazel
fi

3
.gitignore vendored
View File

@ -1,7 +1,8 @@
*~ *~
*.sw[op] *.sw[op]
/bazel /bin/bazel
/bazel-bazel-zig-cc /bazel-bazel-zig-cc
/bazel-bin /bazel-bin
/bazel-out /bazel-out

View File

@ -4,7 +4,8 @@ package(
default_visibility = ["//visibility:public"], default_visibility = ["//visibility:public"],
) )
# TODO(motiejus) use json.encode() and unquote these variables with bazel 4+.
zig_build_macro( zig_build_macro(
absolute_path = {absolute_path}, absolute_path = "{absolute_path}",
zig_include_root = {zig_include_root}, zig_include_root = "{zig_include_root}",
) )

View File

@ -157,14 +157,13 @@ def _zig_repository_impl(repository_ctx):
ZIG_TOOL_WRAPPER.format(zig = str(repository_ctx.path("zig")), zig_tool = zig_tool), ZIG_TOOL_WRAPPER.format(zig = str(repository_ctx.path("zig")), zig_tool = zig_tool),
) )
absolute_path = json.encode(str(repository_ctx.path("")))
repository_ctx.template( repository_ctx.template(
"BUILD.bazel", "BUILD.bazel",
Label("//toolchain:BUILD.sdk.bazel"), Label("//toolchain:BUILD.sdk.bazel"),
executable = False, executable = False,
substitutions = { substitutions = {
"{absolute_path}": absolute_path, "{absolute_path}": str(repository_ctx.path("")),
"{zig_include_root}": json.encode(zig_include_root), "{zig_include_root}": zig_include_root,
}, },
) )