Merge pull request #2569 from clash-lang/fix-ExpWith-9.4-workaround

Move "Work-around for GHC 9.4 bug in ExpWithClashCF"
clash-lang · Aug 29, 2023 · 9b9cf4d · 9b9cf4d
2 parents 934f946 + 12855bf
commit 9b9cf4d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.ci/gitlab/test.yml b/.ci/gitlab/test.yml
@@ -174,6 +174,8 @@ ffi:example:
     - ln -s /bin/true "$MASKBINS/vvp"
     - ls -al "$MASKBINS"
     - .ci/setup.sh
+      # Make sure we get custom cabals setting in the clash-example project too
+    - cp cabal.project.local clash-ffi/example
   script:
      - cd clash-ffi/example && ./run-iverilog.sh
   after_script:

diff --git a/tests/shouldwork/Numbers/Exp.hs b/tests/shouldwork/Numbers/Exp.hs
@@ -4,7 +4,6 @@
 {-# LANGUAGE PartialTypeSignatures #-}
 
 {-# OPTIONS_GHC -Wno-partial-type-signatures #-}
-{-# OPTIONS_GHC -fno-specialise #-} -- TODO: remove when https://gitlab.haskell.org/ghc/ghc/-/issues/23109#note_499130 is fixed
 
 {-# OPTIONS_GHC -fplugin=GHC.TypeLits.Extra.Solver #-}
 {-# OPTIONS_GHC -fplugin=GHC.TypeLits.Normalise #-}

diff --git a/tests/shouldwork/Numbers/ExpWithGhcCF.hs b/tests/shouldwork/Numbers/ExpWithGhcCF.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_GHC -fno-specialise #-} -- TODO: remove when https://gitlab.haskell.org/ghc/ghc/-/issues/23109#note_499130 is fixed
 
 module ExpWithGhcCF where
 import Clash.Prelude