mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-20 09:17:43 +03:00
cde562600c
* Bump rules_haskell Still checking if that helps with GHC 8.8 but we should upgrade this either way. changelog_begin changelog_end * disable grpc patch * shut up buildifier * delete unused ghci grpc patch * Fix Cffi library not found issues * Update deps.bzl Co-Authored-By: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com> Co-authored-by: Andreas Herrmann <andreash87@gmx.ch> Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com>
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From 5210265a3b95327038865b0c8a6cc3cf982626e6 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Herrmann <andreas.herrmann@tweag.io>
|
|
Date: Tue, 25 Feb 2020 18:02:38 +0100
|
|
Subject: [PATCH] Explicitly check for "Cffi" in `is_hs_library`
|
|
|
|
---
|
|
haskell/private/path_utils.bzl | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/haskell/private/path_utils.bzl b/haskell/private/path_utils.bzl
|
|
index 2327c3aa..5e0a986e 100644
|
|
--- a/haskell/private/path_utils.bzl
|
|
+++ b/haskell/private/path_utils.bzl
|
|
@@ -187,7 +187,7 @@ def is_hs_library(lib):
|
|
# linked against directly, but rather through the package configuration. In
|
|
# particular ffi, if included in the GHC bindist, comes in different
|
|
# flavours for different GHC ways (e.g. threaded).
|
|
- return libname.startswith("HS") or lib.owner == Label("@rules_haskell//haskell:toolchain-libraries")
|
|
+ return libname.startswith("HS") or libname == "Cffi" or lib.owner == Label("@rules_haskell//haskell:toolchain-libraries")
|
|
|
|
def get_dynamic_hs_lib_name(ghc_version, lib):
|
|
"""Return name of library by dropping extension,
|
|
--
|
|
2.20.1
|
|
|