Merge pull request #2288 from iteratee/kb/cabal-local-archive

cabal: Honor LOCALE_ARCHIVE settings when building cabal targets

Author: avdv

haskell/cabal.bzl

@@ -387,6 +387,9 @@ def _prepare_cabal_inputs(
     if extra_ldflags_file:
         input_files.append(extra_ldflags_file)
 
+    if hs.toolchain.locale_archive:
+        input_files.append(hs.toolchain.locale_archive)
+
     inputs = depset(
         input_files,
         transitive = [

haskell/private/cabal_wrapper.py

@@ -100,6 +100,8 @@ def canonicalize_path(path):
 os.environ["RULES_HASKELL_GHC_PKG_PATH"] = canonicalize_path(os.getenv("RULES_HASKELL_GHC_PKG_PATH", ""))
 os.environ["RULES_HASKELL_LIBDIR_PATH"] = canonicalize_path(os.getenv("RULES_HASKELL_LIBDIR_PATH", ""))
 os.environ["RULES_HASKELL_DOCDIR_PATH"] = canonicalize_path(os.getenv("RULES_HASKELL_DOCDIR_PATH", ""))
+if "LOCALE_ARCHIVE" in os.environ:
+    os.environ["LOCALE_ARCHIVE"] = canonicalize_path(os.getenv("LOCALE_ARCHIVE"))
 
 component = json_args["component"]
 name = json_args["pkg_name"]