Switch --incompatible_depset_union

See: bazelbuild/rules_python#175
tweag · Jun 27, 2019 · 3e5acf1 · 3e5acf1
1 parent ec2c08c
commit 3e5acf1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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": [