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

20 lines
843 B
Diff
Raw Normal View History

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
Upgrade rules-haskell (#12580) Spun out from the GHC 9 upgrade. changelog_begin changelog_end
2022-01-26 12:12:30 +03:00
index fddf30fd..564da872 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
Fix Windows linking issues (#13097) I have to admit I still fdon’t fully understand why this sometimes fails and sometimes doesn’t. It looks like some caching issue is involved (e.g. currently builds in /d/a/2 succeed while builds in /d/a/1 succed) but I’m not entirely sure that’s all. This PR tries to address this in two ways: 1. Add the library when linking the Haskell bits instead of only on the C library. I think this is required since we the final Haskell binary is linked against the static cbits which does not carry a reference to bcrypt but I’m not completely sure. 2. Rename the target to avoid interference with builds from before the grpc upgrade. I suspect what is happening is that due to the lack of sandboxing we sometimes end up picking up that library if it is in the build tree from an older build instead of the new one. changelog_begin changelog_end
2022-02-28 10:35:30 +03:00
@@ -105,7 +105,13 @@ def package(
Upgrade rules-haskell (#12580) Spun out from the GHC 9 upgrade. changelog_begin changelog_end
2022-01-26 12:12:30 +03:00
"library-dirs": [pkgroot_lib_path] + extra_lib_dirs,
"dynamic-library-dirs": [pkgroot_lib_path] + 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",
Fix Windows linking issues (#13097) I have to admit I still fdon’t fully understand why this sometimes fails and sometimes doesn’t. It looks like some caching issue is involved (e.g. currently builds in /d/a/2 succeed while builds in /d/a/1 succed) but I’m not entirely sure that’s all. This PR tries to address this in two ways: 1. Add the library when linking the Haskell bits instead of only on the C library. I think this is required since we the final Haskell binary is linked against the static cbits which does not carry a reference to bcrypt but I’m not completely sure. 2. Rename the target to avoid interference with builds from before the grpc upgrade. I suspect what is happening is that due to the lack of sandboxing we sometimes end up picking up that library if it is in the build tree from an older build instead of the new one. changelog_begin changelog_end
2022-02-28 10:35:30 +03:00
+ "bcrypt",
Fix typo in windows extra libs patch (#10538) changelog_begin changelog_end Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
2021-08-11 12:00:03 +03:00
+ ] if hs.toolchain.is_windows 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
"depends": hs.package_ids,
Use more deterministic distdir path in haskell_cabal_* (#11963) * Update rules_haskell changelog_begin changelog_end * Use mostly deterministic distdir path changelog_begin changelog_end Use a path for distdir in the `haskell_cabal_*` rules that is based on the package name and deterministic unless there is a collision with an already existing file or directory. The distdir path enters flags that are passed to GHC and thereby enters the 'flag hash' field of the generated interface files. If the distdir path is indeterministic, then the interface file will also be indeterministic. * Pin com_google_protobuf to 3.17.3 The latest version of rules_haskell pins protoc to 3.19.1. However, this generates code that also requires a more recent version of the Java proto libraries. This change pins the protoc version at the same version as the protobuf-java library, see https://github.com/protocolbuffers/protobuf/issues/9236. Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
2021-12-02 22:25:26 +03:00
# TODO[AH] Add haskell_module modules
"exposed-modules": exposed_modules,
Reference in New Issue Copy Permalink