Skip to content

Commit 0f8f2a5

Browse files
committed
gssapiccl: revert "link with keyutils on s390x"
This reverts commit fc34390. This turns out to not be necessary in the Docker container. Epic: CRDB-21133 Release note: None
1 parent 7661812 commit 0f8f2a5

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

build/toolchains/BUILD.bazel

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -413,18 +413,6 @@ config_setting(
413413
},
414414
)
415415

416-
config_setting(
417-
name = "is_dev_s390x",
418-
constraint_values = [
419-
"@io_bazel_rules_go//go/toolchain:linux",
420-
"@platforms//cpu:s390x",
421-
],
422-
flag_values = {
423-
":dev_flag": "true",
424-
":cross_flag": "false",
425-
},
426-
)
427-
428416
bool_flag(
429417
name = "force_build_cdeps_flag",
430418
build_setting_default = False,

pkg/ccl/gssapiccl/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ go_library(
1919
# NB: On Ubuntu, res_nsearch is found in the resolv_wrapper library,
2020
# found in the libresolv-wrapper package.
2121
"//build/toolchains:is_dev_linux": ["-ldl -lresolv -lresolv_wrapper"],
22-
"//build/toolchains:is_dev_s390x": ["-ldl -lresolv -lresolv_wrapper -lkeyutils"],
2322
"@io_bazel_rules_go//go/platform:linux": ["-ldl -lresolv"],
2423
"//conditions:default": [],
2524
}),

0 commit comments

Comments
 (0)