Separate list_exposed_modules from compile_library

These are two completely separate steps. Furthermore, only the
non-profiled version would actually perform list_exposed_modules.

Author: aherrmann

haskell/private/actions/compile.bzl

@@ -464,9 +464,6 @@ def compile_library(
         dep_info,
         plugin_dep_info,
         srcs,
-        ls_modules,
-        other_modules,
-        exposed_modules_reexports,
         import_dir_map,
         extra_srcs,
         user_compile_flags,
@@ -512,21 +509,13 @@ def compile_library(
         arguments = c.args,
     )
 
-    if with_profiling:
-        exposed_modules_file = None
-    else:
-        exposed_modules_file = list_exposed_modules(
-            hs, ls_modules, other_modules, exposed_modules_reexports, c.interfaces_dir
-        )
-
     return struct(
         interfaces_dir = c.interfaces_dir,
         objects_dir = c.objects_dir,
         compile_flags = c.compile_flags,
         source_files = c.source_files,
         extra_source_files = c.extra_source_files,
         import_dirs = c.import_dirs,
-        exposed_modules_file = exposed_modules_file,
         coverage_data = coverage_data,
     )
 

haskell/private/haskell_impl.bzl

@@ -9,6 +9,10 @@ load(
     "empty_HaskellCcInfo",
 )
 load(":cc.bzl", "cc_interop_info")
+load(
+    ":private/actions/compile.bzl",
+    "list_exposed_modules",
+)
 load(
     ":private/actions/link.bzl",
     "link_binary",
@@ -337,9 +341,6 @@ def haskell_library_impl(ctx):
         dep_info,
         plugin_dep_info,
         srcs = srcs_files,
-        ls_modules = ctx.executable._ls_modules,
-        other_modules = other_modules,
-        exposed_modules_reexports = exposed_modules_reexports,
         import_dir_map = import_dir_map,
         extra_srcs = depset(ctx.files.extra_srcs),
         user_compile_flags = ctx.attr.compiler_flags,
@@ -349,6 +350,14 @@ def haskell_library_impl(ctx):
         plugins = ctx.attr.plugins,
     )
 
+    exposed_modules_file = list_exposed_modules(
+        hs,
+        ls_modules = ctx.executable._ls_modules,
+        other_modules = other_modules,
+        exposed_modules_reexports = exposed_modules_reexports,
+        interfaces_dir = c.interfaces_dir,
+    )
+
     c_p = None
 
     if with_profiling:
@@ -424,7 +433,7 @@ def haskell_library_impl(ctx):
         c_p.interfaces_dir if c_p != None else None,
         static_library,
         dynamic_library,
-        c.exposed_modules_file,
+        exposed_modules_file,
         other_modules,
         my_pkg_id,
         static_library_prof = static_library_prof,