From 3e5acf1121ea919635cf4d41e99eb2c8db9d108f Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Thu, 20 Jun 2019 21:45:46 +0200 Subject: [PATCH] Switch --incompatible_depset_union See: https://github.com/bazelbuild/rules_python/issues/175 --- .bazelrc | 6 ++---- haskell/providers.bzl | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.bazelrc b/.bazelrc index 9be75871f..85f35ee81 100644 --- a/.bazelrc +++ b/.bazelrc @@ -33,11 +33,9 @@ test:windows --experimental_enable_runfiles # WIP: bazel 0.27 fixs build\ - --incompatible_require_ctx_in_configure_features=false\ - --incompatible_depset_union=false + --incompatible_require_ctx_in_configure_features=false test\ - --incompatible_require_ctx_in_configure_features=false\ - --incompatible_depset_union=false + --incompatible_require_ctx_in_configure_features=false # test environment does not propagate locales by default # some tests reads files written in UTF8, we need to propagate the correct diff --git a/haskell/providers.bzl b/haskell/providers.bzl index 45bd4f6d1..e3d9beee7 100644 --- a/haskell/providers.bzl +++ b/haskell/providers.bzl @@ -334,7 +334,7 @@ def create_link_config(hs, cc_info, binary, args, dynamic = None, pic = None): package_name = target_unique_name(hs, "link-config").replace("_", "-").replace("@", "-") conf_path = paths.join(package_name, package_name + ".conf") conf_file = hs.actions.declare_file(conf_path) - libs = (cc_static_libs + cc_dynamic_libs).to_list() + libs = cc_static_libs.to_list() + cc_dynamic_libs.to_list() write_package_conf(hs, conf_file, { "name": package_name, "extra-libraries": [