cabal: Make workaround-ghc-mmap-crash a noop on non-x86_64. (#2657) (…

…#2659) Fixes #2656 (cherry picked from commit 22b3a58) Co-authored-by: Rowan Goemans <[email protected]>
clash-lang · Feb 4, 2024 · 4db6dbf · 4db6dbf
1 parent 0f699c8
commit 4db6dbf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/changelog/2024-02-04T21_34_25+01_00_x86_workaround-ghc-mmap-crash_noop b/changelog/2024-02-04T21_34_25+01_00_x86_workaround-ghc-mmap-crash_noop
@@ -0,0 +1 @@
+* cabal: Make `workaround-ghc-mmap-crash` a noop on non-x86_64. Fixes [#2656](https://github.com/clash-lang/clash-compiler/issues/2656)
diff --git a/clash-ghc/clash-ghc.cabal b/clash-ghc/clash-ghc.cabal
@@ -79,7 +79,7 @@ executable clash
     GHC-Options: -dynamic
   -- Note that multiple -with-rtsopts are not cumulative, so we can't add the
   -- common RTS options in the unconditional GHC-Options
-  if flag(workaround-ghc-mmap-crash)
+  if arch(x86_64) && flag(workaround-ghc-mmap-crash)
     GHC-Options: "-with-rtsopts=-A128m -xm20000000"
   else
     GHC-Options: -with-rtsopts=-A128m

diff --git a/clash-lib/clash-lib.cabal b/clash-lib/clash-lib.cabal
@@ -389,7 +389,7 @@ test-suite unittests
   ghc-options:      -Wall -Wcompat -threaded
   -- Note that multiple -with-rtsopts are not cumulative, so we can't add the
   -- common RTS options in the unconditional GHC-Options
-  if flag(workaround-ghc-mmap-crash)
+  if arch(x86_64) && flag(workaround-ghc-mmap-crash)
     GHC-Options: "-with-rtsopts=-N -xm20000000"
   else
     GHC-Options: -with-rtsopts=-N

diff --git a/clash-prelude/clash-prelude.cabal b/clash-prelude/clash-prelude.cabal
@@ -388,7 +388,7 @@ test-suite doctests
       doctest-parallel >= 0.2 && < 0.4,
       filepath
 
-  if flag(workaround-ghc-mmap-crash)
+  if arch(x86_64) && flag(workaround-ghc-mmap-crash)
     ghc-options:    -with-rtsopts=-xm20000000
 
 
@@ -398,7 +398,7 @@ test-suite unittests
   main-is:          unittests.hs
   ghc-options:      -Wall -Wcompat -threaded
   -- Note that multiple -with-rtsopts are not cumulative
-  if flag(workaround-ghc-mmap-crash)
+  if arch(x86_64) && flag(workaround-ghc-mmap-crash)
     ghc-options:    "-with-rtsopts=-N -xm20000000"
   else
     ghc-options:    -with-rtsopts=-N

diff --git a/tests/clash-testsuite.cabal b/tests/clash-testsuite.cabal
@@ -92,7 +92,7 @@ common basic-config
   if flag(multiple-hidden)
     cpp-options:       -DCLASH_MULTIPLE_HIDDEN
 
-  if flag(workaround-ghc-mmap-crash)
+  if arch(x86_64) && flag(workaround-ghc-mmap-crash)
     cpp-options:       -DCLASH_WORKAROUND_GHC_MMAP_CRASH
 
 library
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* cabal: Make `workaround-ghc-mmap-crash` a noop on non-x86_64. Fixes [#2656](https://github.com/clash-lang/clash-compiler/issues/2656)