Back out "Fix call to attr_deps_haskell_lib_infos"

Summary: Original commit changeset: e070f40b02c8 Original Phabricator Diff: D52778012 Reverting because it breaks haxlsh Differential Revision: D52799222 fbshipit-source-id: 894b7c5b2d34cc92b9e97541311ddc118db129e8
facebook · Jan 16, 2024 · c751707 · c751707
1 parent 7ca5e91
commit c751707
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/prelude/haskell/haskell.bzl b/prelude/haskell/haskell.bzl
@@ -66,7 +66,7 @@ load(
 load(
     "@prelude//haskell:util.bzl",
     "attr_deps",
-    "attr_deps_haskell_link_infos",
+    "attr_deps_haskell_link_infos_sans_template_deps",
     "attr_deps_merged_link_infos",
     "attr_deps_profiling_link_infos",
     "attr_deps_shared_library_infos",
@@ -628,7 +628,7 @@ def haskell_library_impl(ctx: AnalysisContext) -> list[Provider]:
         preferred_linkage = Linkage("static")
 
     # Get haskell and native link infos from all deps
-    hlis = attr_deps_haskell_link_infos(ctx)
+    hlis = attr_deps_haskell_link_infos_sans_template_deps(ctx)
     nlis = attr_deps_merged_link_infos(ctx)
     prof_nlis = attr_deps_profiling_link_infos(ctx)
     shared_library_infos = attr_deps_shared_library_infos(ctx)

diff --git a/prelude/haskell/util.bzl b/prelude/haskell/util.bzl
@@ -73,6 +73,16 @@ def attr_deps_haskell_link_infos(ctx: AnalysisContext) -> list[HaskellLinkInfo]:
         ],
     )
 
+# DONT CALL THIS FUNCTION, you want attr_deps_haskell_link_infos instead
+def attr_deps_haskell_link_infos_sans_template_deps(ctx: AnalysisContext) -> list[HaskellLinkInfo]:
+    return filter(
+        None,
+        [
+            d.get(HaskellLinkInfo)
+            for d in attr_deps(ctx)
+        ],
+    )
+
 def attr_deps_haskell_lib_infos(
         ctx: AnalysisContext,
         link_style: LinkStyle,