diff options
| author | Dmitrii Merkurev <dimorinny@google.com> | 2024-05-17 13:40:06 +0100 |
|---|---|---|
| committer | Dmitrii Merkurev <dimorinny@google.com> | 2024-05-17 13:40:06 +0100 |
| commit | 1eb99171efae98867d4be4a5bd6479ea03f43ac9 (patch) | |
| tree | df82dcf2cf6c29319d9df1e2483843b1974efb65 | |
| parent | dfd9d57ca99d49f296189de8728b81b94ed2e16a (diff) | |
| download | lk-master.tar.gz | |
Bug: 291553072
Test: ./tools/bazel run //lk:qemu_riscv64_dist
Change-Id: I2a3f2948769db8fa3cf196c6350c980b9c1f33fd
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
| -rw-r--r-- | BUILD | 17 | ||||
| -rw-r--r-- | bazel.WORKSPACE | 6 |
2 files changed, 3 insertions, 20 deletions
@@ -1,7 +1,7 @@ -load("@bazel_tools//tools/python:toolchain.bzl", "py_runtime_pair") load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir") -clang = "prebuilts/clang/host/linux-x86/clang-r498229b" +# TODO: import clang as a toolchain +clang = "prebuilts/clang/host/linux-x86/clang-r522817" make = "./prebuilts/build-tools/linux-x86/bin/make" @@ -87,16 +87,3 @@ copy_to_dist_dir( dist_dir = "out/lk/dist", flat = True, ) - -# Use SWIG enabled Python -py_runtime_pair( - name = "py_runtime_pair", - py2_runtime = "//prebuilts/build-tools:python2", - py3_runtime = "//{toolchain}:python3".format(toolchain = clang), -) - -toolchain( - name = "py_toolchain", - toolchain = ":py_runtime_pair", - toolchain_type = "@bazel_tools//tools/python:toolchain_type", -) diff --git a/bazel.WORKSPACE b/bazel.WORKSPACE index 8b5fb587..c2cea663 100644 --- a/bazel.WORKSPACE +++ b/bazel.WORKSPACE @@ -1,5 +1 @@ -# Call this before define_kleaf_workspace so we -# always prefer the u-boot py_toolchain. -# As a side effect, all u-boot targets, including those that do not need -# this special python, will use this special python. -register_toolchains("//lk:py_toolchain")
\ No newline at end of file +register_toolchains("//prebuilts/build-tools:py_toolchain")
\ No newline at end of file |