Merge pull request #2311 from tweag/has-ifaces

Skip import-dirs for empty libraries

Author: aherrmann

haskell/private/actions/package.bzl

@@ -52,6 +52,7 @@ def package(
         other_modules,
         my_pkg_id,
         has_hs_library,
+        has_iface = True,
         empty_libs_dir = ""):
     """Create GHC package using ghc-pkg.
 
@@ -65,9 +66,9 @@ def package(
       other_modules: List of hidden modules.
       my_pkg_id: Package id object for this package.
       has_hs_library: Whether hs-libraries should be created.
-	  empty_libs_dir: Directory name where the empty library should be.
-          If empty, this is assumed to be a package description
-		  for a real library. See Note [Empty Libraries] in haskell_impl.bzl.
+      has_iface: Whether the import-dirs field should be populated.
+      empty_libs_dir: Directory name where the empty library should be.
+          If empty, this is assumed to be a package description for a real library. See Note [Empty Libraries] in haskell_impl.bzl.
 
     Returns:
       (File, File): GHC package conf file, GHC package cache file
@@ -98,7 +99,7 @@ def package(
         "key": pkg_id.to_string(my_pkg_id),
         "exposed": "True",
         "hidden-modules": other_modules,
-        "import-dirs": [import_dir],
+        "import-dirs": [import_dir] if has_iface else [],
         "library-dirs": [pkgroot_lib_path] + extra_lib_dirs,
         "dynamic-library-dirs": [pkgroot_lib_path] + extra_dynamic_lib_dirs,
         "extra-libraries": extra_libs,

haskell/private/haskell_impl.bzl

@@ -544,6 +544,7 @@ def haskell_library_impl(ctx):
         other_modules,
         my_pkg_id,
         non_empty,
+        has_iface = non_empty,
     )
 
     empty_libs_dir = "empty_libs"
@@ -557,6 +558,7 @@ def haskell_library_impl(ctx):
         other_modules,
         my_pkg_id,
         has_hs_library = False,
+        has_iface = non_empty,
         empty_libs_dir = empty_libs_dir,
     )