digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 17:28:46 +03:00
Code Issues Projects Releases Wiki Activity
ec36066986
daml/bazel_tools/haskell-windows-extra-libraries.patch

49 lines
2.2 KiB
Diff
Raw Normal View History

Switch to GHC 8.10.3 (#8394) * Switch to GHC 8.10.3 changelog_begin changelog_end * Update bazel-haskell-deps.bzl Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com> * Comment on rules_haskell patch changelog_begin changelog_end * . changelog_begin changelog_end Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com>
2021-01-25 14:53:53 +03:00
diff --git a/haskell/assets/ghc_8_10_3_win_base.patch b/haskell/assets/ghc_8_10_3_win_base.patch
new file mode 100644
index 00000000..b205f35c
--- /dev/null
+++ b/haskell/assets/ghc_8_10_3_win_base.patch
@@ -0,0 +1,11 @@
+--- lib/package.conf.d/base-4.14.1.0.conf 2021-01-06 14:35:47.854943211 +0100
++++ lib/package.conf.d/base-4.14.1.0.conf 2021-01-06 14:34:52.090263590 +0100
+@@ -86,7 +86,7 @@
+ dynamic-library-dirs: $topdir\base-4.14.1.0
+ data-dir: $topdir\x86_64-windows-ghc-8.10.3\base-4.14.1.0
+ hs-libraries: HSbase-4.14.1.0
+-extra-libraries: wsock32 user32 shell32 msvcrt mingw32 mingwex shlwapi
++extra-libraries: wsock32 ws2_32 user32 shell32 msvcrt mingw32 mingwex shlwapi stdc++
+ include-dirs: $topdir\base-4.14.1.0\include
+ includes: HsBase.h
+ depends: ghc-prim-0.6.1 integer-gmp-1.0.3.0 rts
diff --git a/haskell/ghc_bindist.bzl b/haskell/ghc_bindist.bzl
index bd32204e..7f47b1e7 100644
--- a/haskell/ghc_bindist.bzl
+++ b/haskell/ghc_bindist.bzl
@@ -511,6 +511,7 @@ def ghc_bindist(
"8.8.2": ["@rules_haskell//haskell:assets/ghc_8_8_2_win_base.patch"],
"8.8.3": ["@rules_haskell//haskell:assets/ghc_8_8_3_win_base.patch"],
"8.8.4": ["@rules_haskell//haskell:assets/ghc_8_8_4_win_base.patch"],
+ "8.10.3": ["@rules_haskell//haskell:assets/ghc_8_10_3_win_base.patch"],
}.get(version) if target == "windows_amd64" else None
extra_attrs = {"patches": patches, "patch_args": ["-p0"]} if patches else {}
Update rules_haskell and static GHC (#1515) * Update rules_haskell and static GHC Remove patches that have been upstreamed or are no longer required. Update still required patches to match the new rules_haskell version. Previously we patched rules_haskell to coerce GHC into using static Haskell libraries in most places. In particular we moved hs-libraries entries into extra-libraries entries in the package configuration files. A much cleaner approach is to compile GHC with a static RTS, then GHC will by itself choose to load static Haskell libraries. * Remove haskell_cc_import * da-hs-daml-cli -> daml-cli * da-hs-damlc-app -> damlc-app
2019-07-01 14:26:19 +03:00
diff --git a/haskell/private/actions/package.bzl b/haskell/private/actions/package.bzl
Switch to GHC 8.10.3 (#8394) * Switch to GHC 8.10.3 changelog_begin changelog_end * Update bazel-haskell-deps.bzl Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com> * Comment on rules_haskell patch changelog_begin changelog_end * . changelog_begin changelog_end Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com>
2021-01-25 14:53:53 +03:00
index a122332c..bc6d3d11 100644
Update rules_haskell and static GHC (#1515) * Update rules_haskell and static GHC Remove patches that have been upstreamed or are no longer required. Update still required patches to match the new rules_haskell version. Previously we patched rules_haskell to coerce GHC into using static Haskell libraries in most places. In particular we moved hs-libraries entries into extra-libraries entries in the package configuration files. A much cleaner approach is to compile GHC with a static RTS, then GHC will by itself choose to load static Haskell libraries. * Remove haskell_cc_import * da-hs-daml-cli -> daml-cli * da-hs-damlc-app -> damlc-app
2019-07-01 14:26:19 +03:00
--- a/haskell/private/actions/package.bzl
+++ b/haskell/private/actions/package.bzl
Switch to GHC 8.10.3 (#8394) * Switch to GHC 8.10.3 changelog_begin changelog_end * Update bazel-haskell-deps.bzl Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com> * Comment on rules_haskell patch changelog_begin changelog_end * . changelog_begin changelog_end Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com>
2021-01-25 14:53:53 +03:00
@@ -98,8 +98,13 @@ def package(
Update rules_haskell and static GHC (#1515) * Update rules_haskell and static GHC Remove patches that have been upstreamed or are no longer required. Update still required patches to match the new rules_haskell version. Previously we patched rules_haskell to coerce GHC into using static Haskell libraries in most places. In particular we moved hs-libraries entries into extra-libraries entries in the package configuration files. A much cleaner approach is to compile GHC with a static RTS, then GHC will by itself choose to load static Haskell libraries. * Remove haskell_cc_import * da-hs-daml-cli -> daml-cli * da-hs-damlc-app -> damlc-app
2019-07-01 14:26:19 +03:00
"library-dirs": ["${pkgroot}"] + extra_lib_dirs,
Bump rules_haskell (#4687) * Bump rules_haskell Still checking if that helps with GHC 8.8 but we should upgrade this either way. changelog_begin changelog_end * disable grpc patch * shut up buildifier * delete unused ghci grpc patch * Fix Cffi library not found issues * Update deps.bzl Co-Authored-By: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com> Co-authored-by: Andreas Herrmann <andreash87@gmx.ch> Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com>
2020-02-26 13:25:56 +03:00
"dynamic-library-dirs": ["${pkgroot}"] + extra_dynamic_lib_dirs,
Update rules haskell (#2509) * update rules_haskell * adapt rules_haskell patches * io_tweag_rules_haskell --> rules_haskell * io_tweag_rules_haskell --> rules_haskell * haskell:haskell.bzl --> haskell:defs.bzl * rules_haskell_dependencies
2019-08-13 17:46:31 +03:00
"hs-libraries": [pkg_id.library_name(hs, my_pkg_id)] if has_hs_library else [],
Update rules_haskell and static GHC (#1515) * Update rules_haskell and static GHC Remove patches that have been upstreamed or are no longer required. Update still required patches to match the new rules_haskell version. Previously we patched rules_haskell to coerce GHC into using static Haskell libraries in most places. In particular we moved hs-libraries entries into extra-libraries entries in the package configuration files. A much cleaner approach is to compile GHC with a static RTS, then GHC will by itself choose to load static Haskell libraries. * Remove haskell_cc_import * da-hs-daml-cli -> daml-cli * da-hs-damlc-app -> damlc-app
2019-07-01 14:26:19 +03:00
- "extra-libraries": extra_libs,
+ "extra-libraries": extra_libs + ([
+ "stdc++",
+ "crypt32",
+ "shlwapi",
+ "ws2_32",
+ ] if hs.toolchain.is_windows else []),
"depends": hs.package_ids,
Update rules_haskell (#4751) * Update rules_haskell The workaround for linking against `Cffi` in the REPL has been upstreamed in a more generalized form. CHANGELOG_BEGIN CHANGELOG_END * ghcide: Use rules_haskell's hie-bios support * Document `ghcide` Bazel integration * Rename files to match module names Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
2020-03-13 18:49:34 +03:00
"exposed-modules": exposed_modules,
Update rules_haskell and static GHC (#1515) * Update rules_haskell and static GHC Remove patches that have been upstreamed or are no longer required. Update still required patches to match the new rules_haskell version. Previously we patched rules_haskell to coerce GHC into using static Haskell libraries in most places. In particular we moved hs-libraries entries into extra-libraries entries in the package configuration files. A much cleaner approach is to compile GHC with a static RTS, then GHC will by itself choose to load static Haskell libraries. * Remove haskell_cc_import * da-hs-daml-cli -> daml-cli * da-hs-damlc-app -> damlc-app
2019-07-01 14:26:19 +03:00
})
Switch to GHC 8.10.3 (#8394) * Switch to GHC 8.10.3 changelog_begin changelog_end * Update bazel-haskell-deps.bzl Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com> * Comment on rules_haskell patch changelog_begin changelog_end * . changelog_begin changelog_end Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com>
2021-01-25 14:53:53 +03:00
Reference in New Issue Copy Permalink