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

19 lines
730 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
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
index f46f56bc..bfcc9500 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
Upgrade rules_haskell and rules_nixpkgs (#10517) * Update rules_haskell & rules_nixpkgs changelog_begin changelog_end * remove unused patch * Remove the strict-source-names patch This patch was largely motivated by issues with directory outputs on Windows occasionally producing empty outputs that would poison the remote cache. However, we have continued seeing this type of issue despite this patch and have since resorted to a regular fixup job that cleans such empty items out of the cache. With that the strongest motivation with this change is no longer valid and it doesn't seem worth it to maintain it any longer. changelog_begin changelog_end * Remove windows-remove-fake-libs patch This patch was upstreamed. * Update windows-extra-libraries patch The GHC bindist patch is no longer required as it applied to GHC version 8.10.3 but we are using 8.10.4 instead. * Remove cc-wrapper-windows patch This was upstreamed. * Remove protobuf-source patch This was upstreamed * Keep patches in sync between daml and compatibility Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
2021-08-09 16:19:17 +03:00
@@ -107,7 +107,12 @@ 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",
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,
})
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