Add hs.toolchain.files to c2hs inputs

The c2hs action depends on `lib/include/ghcplatform.h` and `lib/include/ghcversion.h`.
tweag · Feb 8, 2021 · 4d0d4e7 · 4d0d4e7
1 parent aa4258e
commit 4d0d4e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/haskell/c2hs.bzl b/haskell/c2hs.bzl
@@ -73,6 +73,7 @@ def _c2hs_library_impl(ctx):
             depset([chs_file]),
             depset(dep_chi_files),
             depset(cc.files),
+            depset(hs.toolchain.files),
             set.to_depset(version_macro_headers),
             inputs,
         ]),

diff --git a/haskell/ghc_bindist.bzl b/haskell/ghc_bindist.bzl
@@ -356,7 +356,11 @@ DISTDIR="$( dirname "$(resolved="$0"; cd "$(dirname "$resolved")"; while tmp="$(
         tools = [":bin"],
         libraries = "toolchain_libraries",
         # See Note [GHC toolchain files]
-        files = [":lib/settings"],
+        files = [
+            ":lib/settings",
+            ":lib/include/ghcplatform.h",
+            ":lib/include/ghcversion.h",
+        ],
         version = repr(ctx.attr.version),
         static_runtime = os == "windows",
         fully_static_link = False,  # XXX not yet supported for bindists.