From 2ae238af4a4558adf7b411f999bb66c7f692df8f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 13:32:08 +0000 Subject: [PATCH 1/2] Update dependency bazel_features to v1.20.0 --- .../tests/repl-targets/hs_lib_repl_test/WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE index 19b093000..10e2c1c91 100644 --- a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE +++ b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE @@ -143,9 +143,9 @@ register_toolchains( http_archive( name = "bazel_features", - sha256 = "bdc12fcbe6076180d835c9dd5b3685d509966191760a0eb10b276025fcb76158", - strip_prefix = "bazel_features-1.17.0", - url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.17.0/bazel_features-v1.17.0.tar.gz", + sha256 = "c2596994cf63513bd44180411a4ac3ae95d32bf59148fcb6087a4642b3ffef11", + strip_prefix = "bazel_features-1.20.0", + url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.20.0/bazel_features-v1.20.0.tar.gz", ) load("@bazel_features//:deps.bzl", "bazel_features_deps") From a72d4025578749ff981c3d2f743d2344d719fa07 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 18 Nov 2024 09:26:16 +0100 Subject: [PATCH 2/2] Only use cc_shared_library if it is enabled --- .../hs_lib_repl_test/maybe_cc_shared_library.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/maybe_cc_shared_library.bzl b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/maybe_cc_shared_library.bzl index a738c3b6d..abbd0a31b 100644 --- a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/maybe_cc_shared_library.bzl +++ b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/maybe_cc_shared_library.bzl @@ -6,12 +6,12 @@ def maybe_cc_shared_library(name, **kwargs): native.cc_shared_library( name = shared_name, deps = [name], - **kwargs, + **kwargs ) return shared_name return name - - def _has_cc_shared_library(): + if hasattr(cc_common, "check_experimental_cc_shared_library"): + return cc_common.check_experimental_cc_shared_library() return bazel_features.globals.CcSharedLibraryInfo != None