diff options
| author | Alistair Delva <adelva@google.com> | 2024-04-11 14:41:02 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2024-04-15 22:08:50 +0000 |
| commit | 137f70a7b3d1c7a0c5db740cefab452717ec193a (patch) | |
| tree | 07cd7e6453aa874602fde3e67f760a0554032c18 | |
| parent | b52156669a887ea9c9f3daed83e250c78def17c2 (diff) | |
| download | u-boot-137f70a7b3d1c7a0c5db740cefab452717ec193a.tar.gz | |
Use swig bits from kernel-build-tools
Change-Id: Iadbeba8a89908b196a128afdcd1cea86a6791511
| -rw-r--r-- | BUILD.bazel | 5 | ||||
| -rw-r--r-- | bazel.WORKSPACE | 5 | ||||
| -rw-r--r-- | bazel.WORKSPACE.bzlmod | 5 | ||||
| -rw-r--r-- | build.config.rockpi4 | 2 | ||||
| -rw-r--r-- | build.config.x86_64 | 2 |
5 files changed, 3 insertions, 16 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 61096ca692..1c983a0ce6 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -53,7 +53,6 @@ kernel_build( build_config = "build.config.kiwi", deps = [ "//prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9:binaries", - "@swig//:lib", ], ) @@ -75,7 +74,6 @@ kernel_build( build_config = "build.config.kiwi_p", deps = [ "//prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9:binaries", - "@swig//:lib", ], ) @@ -97,7 +95,6 @@ kernel_build( build_config = "build.config.qemu.x86_64", deps = [ "//prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9:binaries", - "@swig//:lib", ], ) @@ -119,7 +116,6 @@ kernel_build( build_config = "build.config.crosvm.x86_64", deps = [ "//prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9:binaries", - "@swig//:lib", ], ) @@ -218,7 +214,6 @@ kernel_build( build_config = "build.config.rockpi4", deps = [ "//prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9:binaries", - "@swig//:lib", ], ) diff --git a/bazel.WORKSPACE b/bazel.WORKSPACE index 4a4b21ab22..ca7587cb8e 100644 --- a/bazel.WORKSPACE +++ b/bazel.WORKSPACE @@ -1,7 +1,2 @@ -local_repository( - name = "swig", - path = "external/swig", -) - load("//build/kernel/kleaf:workspace.bzl", "define_kleaf_workspace") define_kleaf_workspace(common_kernel_package = "u-boot") diff --git a/bazel.WORKSPACE.bzlmod b/bazel.WORKSPACE.bzlmod index 79075c6ac3..8b13789179 100644 --- a/bazel.WORKSPACE.bzlmod +++ b/bazel.WORKSPACE.bzlmod @@ -1,4 +1 @@ -local_repository( - name = "swig", - path = "external/swig", -) + diff --git a/build.config.rockpi4 b/build.config.rockpi4 index 23da9d6e67..340f4c77a5 100644 --- a/build.config.rockpi4 +++ b/build.config.rockpi4 @@ -3,7 +3,7 @@ # Can't build ATF image or SPL with ld.lld yet LD=aarch64-linux-androidkernel-ld -SWIG_LIB=${ROOT_DIR}/external/swig/Lib +SWIG_LIB=${ROOT_DIR}/prebuilts/kernel-build-tools/linux-x86/share/swig # llvm-objcopy: error: unknown argument '--pad-to=8355840' OBJCOPY=aarch64-linux-androidkernel-objcopy diff --git a/build.config.x86_64 b/build.config.x86_64 index 5b38a5fa66..21b72bedb8 100644 --- a/build.config.x86_64 +++ b/build.config.x86_64 @@ -7,7 +7,7 @@ LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-a # TODO(b/164420327): ld.lld builds, but does not boot LD=ld.bfd -SWIG_LIB=${ROOT_DIR}/external/swig/Lib +SWIG_LIB=${ROOT_DIR}/prebuilts/kernel-build-tools/linux-x86/share/swig MAKE_GOALS=" " |