62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From 9c9d27561780bc56d9f0867e325c7421a94ee1cb Mon Sep 17 00:00:00 2001
|
|
From: Harsh Bhatia <bhatia4@llnl.gov>
|
|
Date: Tue, 15 Dec 2020 15:56:10 -0800
|
|
Subject: [PATCH] https://github.com/bazelbuild/bazel/commit/ab62a6e097590dac5ec946ad7a796ea0e8593ae0
|
|
|
|
---
|
|
src/conditions/BUILD | 6 ++++++
|
|
third_party/BUILD | 8 ++++++--
|
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/conditions/BUILD b/src/conditions/BUILD
|
|
index 2b28e28057..faa41a439d 100644
|
|
--- a/src/conditions/BUILD
|
|
+++ b/src/conditions/BUILD
|
|
@@ -10,6 +10,12 @@ filegroup(
|
|
visibility = ["//src:__pkg__"],
|
|
)
|
|
|
|
+config_setting(
|
|
+ name = "linux_ppc",
|
|
+ values = {"cpu": "ppc"},
|
|
+ visibility = ["//visibility:public"],
|
|
+)
|
|
+
|
|
config_setting(
|
|
name = "linux_x86_64",
|
|
values = {"cpu": "k8"},
|
|
diff --git a/third_party/BUILD b/third_party/BUILD
|
|
index 159006d741..4fcae54c00 100644
|
|
--- a/third_party/BUILD
|
|
+++ b/third_party/BUILD
|
|
@@ -523,12 +523,13 @@ UNNECESSARY_DYNAMIC_LIBRARIES = select({
|
|
"//src/conditions:darwin": "*.so *.dll",
|
|
"//src/conditions:darwin_x86_64": "*.so *.dll",
|
|
"//src/conditions:linux_x86_64": "*.jnilib *.dll",
|
|
+ "//src/conditions:linux_ppc": "*.so *.jnilib *.dll",
|
|
# The .so file is an x86 one, so we can just remove it if the CPU is not x86
|
|
"//src/conditions:arm": "*.so *.jnilib *.dll",
|
|
"//src/conditions:linux_aarch64": "*.so *.jnilib *.dll",
|
|
# Play it safe -- better have a big binary than a slow binary
|
|
# zip -d does require an argument. Supply something bogus.
|
|
- "//conditions:default": "*.bogusextension",
|
|
+ "//conditions:default": "",
|
|
})
|
|
|
|
# Remove native libraries that are for a platform different from the one we are
|
|
@@ -537,7 +538,10 @@ genrule(
|
|
name = "filter_netty_dynamic_libs",
|
|
srcs = ["netty_tcnative/netty-tcnative-boringssl-static-2.0.24.Final.jar"],
|
|
outs = ["netty_tcnative/netty-tcnative-filtered.jar"],
|
|
- cmd = "cp $< $@ && zip -qd $@ " + UNNECESSARY_DYNAMIC_LIBRARIES,
|
|
+ cmd = "cp $< $@ && " +
|
|
+ # End successfully if there is nothing to be deleted from the archive
|
|
+ "if [ -n '" + UNNECESSARY_DYNAMIC_LIBRARIES + "' ]; then " +
|
|
+ "zip -qd $@ " + UNNECESSARY_DYNAMIC_LIBRARIES + "; fi",
|
|
)
|
|
|
|
java_import(
|
|
--
|
|
2.21.0 (Apple Git-122.2)
|
|
|