digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-19 08:48:21 +03:00
Code Issues Projects Releases Wiki Activity

Drop redundant isystem patch (#7085)

Browse Source 
As pointed out by the comment, we should not need this with
stack_snapshot anymore.

changelog_begin
changelog_end
This commit is contained in:
Moritz Kiefer 2020-08-11 16:33:14 +02:00 committed by GitHub
parent 0857c28874
commit 0a23318fb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bazel_tools/haskell-no-isystem.patch
View File

@ -1,13 +0,0 @@
diff --git a/haskell/cc.bzl b/haskell/cc.bzl
index c5888087..544f8124 100644
--- a/haskell/cc.bzl
+++ b/haskell/cc.bzl
@@ -67,7 +67,7 @@ def cc_interop_info(ctx):
] + [
f
for include in cc_ctx.system_includes.to_list()
- for f in ["-isystem", include]
+ for f in ["-I", include]
],
)

3
deps.bzl
View File

@ -75,9 +75,6 @@ def daml_deps():
"@com_github_digital_asset_daml//bazel_tools:haskell-windows-remove-fake-libs.patch",
# This is a daml specific patch and not upstreamable.
"@com_github_digital_asset_daml//bazel_tools:haskell-windows-extra-libraries.patch",
# This fixes a ghc-lib specific build issue and is not upstreamable.
# This might also be fixed by using `stack_snapshot` in the future.
"@com_github_digital_asset_daml//bazel_tools:haskell-no-isystem.patch",
# This should be made configurable in rules_haskell.
# Remove this patch once that's available.
"@com_github_digital_asset_daml//bazel_tools:haskell-opt.patch",