Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cabal: Make workaround-ghc-mmap-crash a noop on non-x86_64 #2657

Merged
merged 1 commit into from
Feb 4, 2024
Merged

cabal: Make workaround-ghc-mmap-crash a noop on non-x86_64 #2657

merged 1 commit into from
Feb 4, 2024

Conversation

rowanG077
Copy link
Member

Fixes #2656

@rowanG077 rowanG077 mentioned this pull request Feb 4, 2024
Closed
@DigitalBrains1
Copy link
Member

Ah, thank you!

I'm thinking we should (also?) go one layer deeper and have the flag be a no-op on anything but x86_64, either using CPP in all call sites or in all the .cabal files if Cabal knows how to deal with these situations.

@rowanG077
Copy link
Member Author

rowanG077 commented Feb 4, 2024 •
edited
Loading

I have moved the checks to the cabal files. I have removed it from the nix. It's only more confusing if the same checks occurs in multiple places where the nix checks wouldn't matter anymore.

DigitalBrains1
DigitalBrains1 approved these changes Feb 4, 2024
View reviewed changes
Copy link
Member

@DigitalBrains1 DigitalBrains1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes perfect sense! Thanks!

@DigitalBrains1 DigitalBrains1 enabled auto-merge (squash) February 4, 2024 21:07
@DigitalBrains1 DigitalBrains1 changed the title nix: Only enable workaround-ghc-mmap-crash if on x86_64 cabal: Make workaround-ghc-mmap-crash a noop on non-x86_64 Feb 4, 2024
@DigitalBrains1 DigitalBrains1 merged commit 22b3a58 into master Feb 4, 2024
13 checks passed
@DigitalBrains1 DigitalBrains1 deleted the fix-aarch64 branch February 4, 2024 21:31
mergify bot pushed a commit that referenced this pull request Feb 4, 2024
@rowanG077 @mergify
cabal: Make workaround-ghc-mmap-crash a noop on non-x86_64. (#2657)
2a80ebd 
Fixes #2656

(cherry picked from commit 22b3a58)

# Conflicts:
#	clash-lib/clash-lib.cabal
#	clash-prelude/clash-prelude.cabal
@mergify mergify bot mentioned this pull request Feb 4, 2024
Closed
mergify bot pushed a commit that referenced this pull request Feb 4, 2024
@rowanG077 @mergify
cabal: Make workaround-ghc-mmap-crash a noop on non-x86_64. (#2657)
5432fda 
Fixes #2656

(cherry picked from commit 22b3a58)
@mergify mergify bot mentioned this pull request Feb 4, 2024
Merged
DigitalBrains1 pushed a commit that referenced this pull request Feb 4, 2024
@mergify @rowanG077
cabal: Make workaround-ghc-mmap-crash a noop on non-x86_64. (#2657) (…
4db6dbf 
…#2659)

Fixes #2656

(cherry picked from commit 22b3a58)

Co-authored-by: Rowan Goemans <[email protected]>
martijnbastiaan pushed a commit that referenced this pull request Mar 2, 2024
@rowanG077 @martijnbastiaan
cabal: Make workaround-ghc-mmap-crash a noop on non-x86_64. (#2657)
0b4733c 
Fixes #2656

(cherry picked from commit 22b3a58)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DigitalBrains1 DigitalBrains1 DigitalBrains1 approved these changes

Assignees
No one assigned
Labels
backport 1.6 backport 1.8
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

unknown RTS option: -xm20000000
2 participants
@rowanG077 @DigitalBrains1