Bazelify compiler's global package database

.bazelrc

@@ -3,7 +3,7 @@
 # Use this configuration when targeting Windows. Eventually this will
 # no longer be required:
 # https://bazel.build/roadmaps/platforms.html#replace---cpu-and---host_cpu-flags.
-build:windows --crosstool_top=@io_tweag_rules_haskell_ghc_windows_amd64//:toolchain -s --verbose_failures --sandbox_debug
+build:windows --crosstool_top=@io_tweag_rules_haskell_ghc_windows_amd64//:cc_toolchain -s --verbose_failures --sandbox_debug
 
 build:ci --loading_phase_threads=1
 build:ci --jobs=2

.circleci/config.yml

@@ -29,7 +29,7 @@ jobs:
           name: Setup test environment
           command: |
             apt-get update
-            apt-get install -y wget gnupg golang make libgmp3-dev libtinfo-dev pkg-config zip g++ zlib1g-dev unzip python bash-completion locales
+            apt-get install -y wget gnupg golang make libgmp3-dev libtinfo-dev pkg-config zip g++ zlib1g-dev unzip python python3 bash-completion locales
             echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
             locale-gen
             wget "https://github.com/bazelbuild/bazel/releases/download/0.24.0/bazel_0.24.0-linux-x86_64.deb"

CHANGELOG.md

@@ -108,6 +108,14 @@ of `rules_haskell`.
   sed -i 's/^haskell_import/haskell_toolchain_library/' **/BUILD{,.bazel}
   sed -i 's/"haskell_import"/"haskell_toolchain_library"/' **/BUILD{,.bazel}
   ```
+* The `haskell_toolchain` macro now no longer adds a `toolchain`
+  definition. You must now define yourself a `haskell_toolchain` and
+  a `toolchain` separately. This should be a mostly transparent
+  change, because nearly no one uses these functions directly. They
+  are normally only used transitively via
+  `haskell_register_toolchains` and related functions.
+* It is now possible to statically link Haskell libraries in CC
+  binaries.
 
   See [#843](https://github.com/tweag/rules_haskell/pull/843).
 

WORKSPACE

@@ -69,7 +69,6 @@ load(
 haskell_nixpkgs_package(
     name = "ghc",
     attribute_path = "haskellPackages.ghc",
-    build_file = "//haskell:ghc.BUILD",
     nix_file = "//tests:ghc.nix",
     nix_file_deps = ["//nixpkgs:default.nix"],
     # rules_nixpkgs assumes we want to read from `<nixpkgs>` implicitly

azure-pipelines.yml

@@ -3,6 +3,10 @@ jobs:
   pool:
     vmImage: 'vs2017-win2016'
   steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.7'
+      architecture: 'x64'
   - bash: |
       set -e
       curl -LO https://github.com/bazelbuild/bazel/releases/download/0.24.0/bazel-0.24.0-windows-x86_64.exe

examples/primitive/BUILD.bazel

@@ -9,11 +9,13 @@ haskell_toolchain_library(name = "base")
 
 haskell_toolchain_library(name = "ghc-prim")
 
+haskell_toolchain_library(name = "rts")
+
 cc_library(
     name = "memops",
     srcs = ["cbits/primitive-memops.c"],
     hdrs = ["cbits/primitive-memops.h"],
-    deps = ["@ghc//:threaded-rts"],
+    deps = [":rts"],
 )
 
 haskell_library(

examples/rts/BUILD.bazel

@@ -7,23 +7,22 @@ load(
 
 haskell_toolchain_library(name = "base")
 
+haskell_toolchain_library(name = "rts")
+
 haskell_library(
     name = "add-one-hs",
     srcs = ["One.hs"],
     deps = [":base"],
 )
 
-cc_haskell_import(
-    name = "add-one-so",
-    dep = ":add-one-hs",
-)
-
 cc_test(
     name = "add-one",
     srcs = [
         "main.c",
-        ":add-one-so",
     ],
     visibility = ["//visibility:public"],
-    deps = ["@ghc//:threaded-rts"],
+    deps = [
+        ":add-one-hs",
+        ":rts",
+    ],
 )

examples/vector/BUILD.bazel

@@ -11,10 +11,6 @@ haskell_toolchain_library(name = "deepseq")
 
 haskell_toolchain_library(name = "ghc-prim")
 
-haskell_toolchain_library(name = "primitive")
-
-haskell_toolchain_library(name = "semigroups")
-
 haskell_library(
     name = "vector",
     testonly = 1,

haskell/BUILD.bazel

@@ -5,6 +5,7 @@ exports_files(
         "private/haddock_wrapper.sh.tpl",
         "private/coverage_wrapper.sh.tpl",
         "private/osx_cc_wrapper.sh.tpl",
+        "private/pkgdb_to_bzl.py",
     ],
 )
 
@@ -14,6 +15,12 @@ exports_files(
     visibility = ["//tests/unit-tests:__pkg__"],
 )
 
+py_binary(
+    name = "pkgdb_to_bzl",
+    srcs = ["private/pkgdb_to_bzl.py"],
+    visibility = ["//visibility:public"],
+)
+
 py_binary(
     name = "ls_modules",
     srcs = ["private/ls_modules.py"],

haskell/doctest.bzl

@@ -13,6 +13,7 @@ load(
     "@io_tweag_rules_haskell//haskell:providers.bzl",
     "HaskellInfo",
     "HaskellLibraryInfo",
+    "HaskellPrebuiltPackageInfo",
 )
 
 def _doctest_toolchain_impl(ctx):
@@ -80,7 +81,7 @@ def _haskell_doctest_single(target, ctx):
       File: the doctest log.
     """
 
-    if HaskellInfo not in target:
+    if HaskellInfo not in target or HaskellPrebuiltPackageInfo in target:
         return []
 
     hs = haskell_context(ctx, ctx.attr)

haskell/ghc.BUILD.tpl

@@ -0,0 +1,52 @@
+load(
+    "@io_tweag_rules_haskell//haskell:cc_toolchain_config.bzl",
+    "cc_toolchain_config",
+)
+load(
+    "@io_tweag_rules_haskell//haskell:haskell.bzl",
+    "haskell_import",
+    "haskell_toolchain",
+)
+
+package(default_visibility = ["//visibility:public"])
+
+%{toolchain}
+
+filegroup(
+    name = "bin",
+    srcs = glob(["bin/*"]),
+)
+
+# Expose embedded MinGW toolchain when on Windows.
+
+filegroup(
+    name = "mingw",
+    srcs = glob(["mingw/**"]),
+)
+
+cc_toolchain_suite(
+    name = "cc_toolchain",
+    toolchains = {
+        "x64_windows": ":cc-compiler-mingw64",
+        "x64_windows|ghc-mingw-gcc": ":cc-compiler-mingw64",
+    },
+)
+
+# Keep in sync with @bazel_tools//cpp:cc-compiler-x64_windows definition.
+cc_toolchain(
+    name = "cc-compiler-mingw64",
+    all_files = ":mingw",
+    ar_files = ":mingw",
+    as_files = ":mingw",
+    compiler_files = ":mingw",
+    cpu = "x64_windows",
+    dwp_files = ":mingw",
+    linker_files = ":mingw",
+    objcopy_files = ":mingw",
+    strip_files = ":mingw",
+    supports_param_files = 0,
+    toolchain_config = ":ghc_windows_mingw64_config",
+    toolchain_identifier = "ghc_windows_mingw64",
+)
+
+cc_toolchain_config(name = "ghc_windows_mingw64_config")