Don't set -fplugin in ghc-options

This workarounds haskell/cabal#9375
ucsd-progsys · Mar 7, 2024 · b396172 · b396172
1 parent 6aeb737
commit b396172
Show file tree

Hide file tree

Showing 56 changed files with 54 additions and 6 deletions.
diff --git a/liquid-parallel/liquid-parallel.cabal b/liquid-parallel/liquid-parallel.cabal
@@ -23,5 +23,3 @@ library
                     , liquidhaskell        >= 0.9.2.8
   default-language:   Haskell2010
   default-extensions: PackageImports
-  if impl(ghc >= 8.10)
-    ghc-options: -fplugin=LiquidHaskell
diff --git a/liquid-parallel/src/Control/Parallel/Strategies_LHAssumptions.hs b/liquid-parallel/src/Control/Parallel/Strategies_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Control.Parallel.Strategies_LHAssumptions where
 

diff --git a/liquid-prelude/liquid-prelude.cabal b/liquid-prelude/liquid-prelude.cabal
@@ -32,5 +32,3 @@ library
                     , containers           >= 0.6.4.1  && < 0.7
                     , liquidhaskell        >= 0.9.2.8
   default-language:   Haskell2010
-  if impl(ghc >= 8.10)
-    ghc-options: -fplugin=LiquidHaskell
diff --git a/liquid-prelude/src/Language/Haskell/Liquid/Bag.hs b/liquid-prelude/src/Language/Haskell/Liquid/Bag.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 module Language.Haskell.Liquid.Bag where
 
 import qualified Data.Map      as M

diff --git a/liquid-prelude/src/Language/Haskell/Liquid/Equational.hs b/liquid-prelude/src/Language/Haskell/Liquid/Equational.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 module Language.Haskell.Liquid.Equational where 
 
 -------------------------------------------------------------------------------

diff --git a/liquid-prelude/src/Language/Haskell/Liquid/Foreign.hs b/liquid-prelude/src/Language/Haskell/Liquid/Foreign.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE MagicHash #-}
 

diff --git a/liquid-prelude/src/Language/Haskell/Liquid/List.hs b/liquid-prelude/src/Language/Haskell/Liquid/List.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 module Language.Haskell.Liquid.List (transpose) where
 
 {-@ lazy transpose @-}

diff --git a/liquid-prelude/src/Language/Haskell/Liquid/Prelude.hs b/liquid-prelude/src/Language/Haskell/Liquid/Prelude.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 {-# LANGUAGE MagicHash      #-}
 
 module Language.Haskell.Liquid.Prelude where

diff --git a/liquid-prelude/src/Language/Haskell/Liquid/ProofCombinators.hs b/liquid-prelude/src/Language/Haskell/Liquid/ProofCombinators.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE FlexibleInstances     #-}
 {-# LANGUAGE TypeFamilies          #-}

diff --git a/liquid-prelude/src/Language/Haskell/Liquid/RTick.hs b/liquid-prelude/src/Language/Haskell/Liquid/RTick.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 
 --
 -- Liquidate your assets: reasoning about resource usage in Liquid Haskell.

diff --git a/liquid-prelude/src/Language/Haskell/Liquid/RTick/Combinators.hs b/liquid-prelude/src/Language/Haskell/Liquid/RTick/Combinators.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 
 --
 -- Liquidate your assets: reasoning about resource usage in Liquid Haskell.

diff --git a/liquid-prelude/src/Language/Haskell/Liquid/String.hs b/liquid-prelude/src/Language/Haskell/Liquid/String.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 -- Support for Strings for SMT 
 
 {-# LANGUAGE OverloadedStrings   #-}

diff --git a/liquid-vector/liquid-vector.cabal b/liquid-vector/liquid-vector.cabal
@@ -24,5 +24,5 @@ library
   default-language:   Haskell2010
   default-extensions: PackageImports
   if impl(ghc >= 8.10)
-    ghc-options: -fplugin=LiquidHaskell -fplugin-opt=LiquidHaskell:--no-positivity-check
+    ghc-options: -fplugin-opt=LiquidHaskell:--no-positivity-check
 
diff --git a/liquid-vector/src/Data/Vector_LHAssumptions.hs b/liquid-vector/src/Data/Vector_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskell #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.Vector_LHAssumptions where
 

diff --git a/liquidhaskell.cabal b/liquidhaskell.cabal
@@ -84,7 +84,7 @@ library
                       ghc-bignum,
                       ghc-prim
   default-language:   Haskell98
-  ghc-options:        -Wall -fplugin=LiquidHaskellBoot
+  ghc-options:        -Wall
 
   if flag(devel)
     ghc-options:      -Werror
diff --git a/src/Data/Bits_LHAssumptions.hs b/src/Data/Bits_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module Data.Bits_LHAssumptions where
 
 {-@

diff --git a/src/Data/ByteString/Char8_LHAssumptions.hs b/src/Data/ByteString/Char8_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.ByteString.Char8_LHAssumptions where
 

diff --git a/src/Data/ByteString/Lazy/Char8_LHAssumptions.hs b/src/Data/ByteString/Lazy/Char8_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.ByteString.Lazy.Char8_LHAssumptions where
 

diff --git a/src/Data/ByteString/Lazy_LHAssumptions.hs b/src/Data/ByteString/Lazy_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.ByteString.Lazy_LHAssumptions where
 

diff --git a/src/Data/ByteString/Short_LHAssumptions.hs b/src/Data/ByteString/Short_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.ByteString.Short_LHAssumptions where
 

diff --git a/src/Data/ByteString/Unsafe_LHAssumptions.hs b/src/Data/ByteString/Unsafe_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.ByteString.Unsafe_LHAssumptions where
 

diff --git a/src/Data/ByteString_LHAssumptions.hs b/src/Data/ByteString_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.ByteString_LHAssumptions where
 

diff --git a/src/Data/Either_LHAssumptions.hs b/src/Data/Either_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module Data.Either_LHAssumptions where
 
 import GHC.Types_LHAssumptions()

diff --git a/src/Data/Foldable_LHAssumptions.hs b/src/Data/Foldable_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module Data.Foldable_LHAssumptions where
 
 import GHC.Types_LHAssumptions()

diff --git a/src/Data/Int_LHAssumptions.hs b/src/Data/Int_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module Data.Int_LHAssumptions where
 
 {-@

diff --git a/src/Data/Maybe_LHAssumptions.hs b/src/Data/Maybe_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.Maybe_LHAssumptions where
 

diff --git a/src/Data/Set_LHAssumptions.hs b/src/Data/Set_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.Set_LHAssumptions where
 

diff --git a/src/Data/String_LHAssumptions.hs b/src/Data/String_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.String_LHAssumptions where
 

diff --git a/src/Data/Tuple_LHAssumptions.hs b/src/Data/Tuple_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Data.Tuple_LHAssumptions where
 

diff --git a/src/Data/Word_LHAssumptions.hs b/src/Data/Word_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module Data.Word_LHAssumptions where
 
 {-@

diff --git a/src/Foreign/C/String_LHAssumptions.hs b/src/Foreign/C/String_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Foreign.C.String_LHAssumptions where
 

diff --git a/src/Foreign/C/Types_LHAssumptions.hs b/src/Foreign/C/Types_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module Foreign.C.Types_LHAssumptions where
 
 import GHC.Int_LHAssumptions()

diff --git a/src/Foreign/Concurrent_LHAssumptions.hs b/src/Foreign/Concurrent_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Foreign.Concurrent_LHAssumptions where
 

diff --git a/src/Foreign/ForeignPtr_LHAssumptions.hs b/src/Foreign/ForeignPtr_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Foreign.ForeignPtr_LHAssumptions where
 

diff --git a/src/Foreign/Marshal/Alloc_LHAssumptions.hs b/src/Foreign/Marshal/Alloc_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Foreign.Marshal.Alloc_LHAssumptions where
 

diff --git a/src/Foreign/Ptr_LHAssumptions.hs b/src/Foreign/Ptr_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module Foreign.Ptr_LHAssumptions where
 
 

diff --git a/src/Foreign/Storable_LHAssumptions.hs b/src/Foreign/Storable_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Foreign.Storable_LHAssumptions where
 

diff --git a/src/GHC/Base_LHAssumptions.hs b/src/GHC/Base_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module GHC.Base_LHAssumptions where
 

diff --git a/src/GHC/CString_LHAssumptions.hs b/src/GHC/CString_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# LANGUAGE MagicHash #-}
 {-# OPTIONS_GHC -Wno-missing-signatures #-}
 module GHC.CString_LHAssumptions() where

diff --git a/src/GHC/Classes_LHAssumptions.hs b/src/GHC/Classes_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module GHC.Classes_LHAssumptions where
 
 import GHC.Classes()

diff --git a/src/GHC/Exts_LHAssumptions.hs b/src/GHC/Exts_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module GHC.Exts_LHAssumptions where
 

diff --git a/src/GHC/Float_LHAssumptions.hs b/src/GHC/Float_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module GHC.Float_LHAssumptions(Floating(..)) where
 
 {-@

diff --git a/src/GHC/ForeignPtr_LHAssumptions.hs b/src/GHC/ForeignPtr_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module GHC.ForeignPtr_LHAssumptions where
 

diff --git a/src/GHC/IO/Handle_LHAssumptions.hs b/src/GHC/IO/Handle_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module GHC.IO.Handle_LHAssumptions where
 

diff --git a/src/GHC/Int_LHAssumptions.hs b/src/GHC/Int_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module GHC.Int_LHAssumptions where
 

diff --git a/src/GHC/List_LHAssumptions.hs b/src/GHC/List_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module GHC.List_LHAssumptions where
 

diff --git a/src/GHC/Maybe_LHAssumptions.hs b/src/GHC/Maybe_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module GHC.Maybe_LHAssumptions where
 
 {-@

diff --git a/src/GHC/Num/Integer_LHAssumptions.hs b/src/GHC/Num/Integer_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# LANGUAGE MagicHash #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module GHC.Num.Integer_LHAssumptions() where

diff --git a/src/GHC/Num_LHAssumptions.hs b/src/GHC/Num_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module GHC.Num_LHAssumptions where
 
 {-@

diff --git a/src/GHC/Ptr_LHAssumptions.hs b/src/GHC/Ptr_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module GHC.Ptr_LHAssumptions where
 

diff --git a/src/GHC/Real_LHAssumptions.hs b/src/GHC/Real_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 -- Reexports are necessary for LH to expose specs of type classes
 module GHC.Real_LHAssumptions(Integral(..), Fractional(..)) where
 

diff --git a/src/GHC/Types_LHAssumptions.hs b/src/GHC/Types_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# LANGUAGE MagicHash #-}
 {-# OPTIONS_GHC -Wno-missing-signatures #-}
 module GHC.Types_LHAssumptions() where

diff --git a/src/GHC/Word_LHAssumptions.hs b/src/GHC/Word_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module GHC.Word_LHAssumptions where
 
 {-@

diff --git a/src/Liquid/Prelude/Real_LHAssumptions.hs b/src/Liquid/Prelude/Real_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module Liquid.Prelude.Real_LHAssumptions where
 
 import GHC.Num()

diff --git a/src/Liquid/Prelude/Totality_LHAssumptions.hs b/src/Liquid/Prelude/Totality_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-}
 module Liquid.Prelude.Totality_LHAssumptions where
 

diff --git a/src/Prelude_LHAssumptions.hs b/src/Prelude_LHAssumptions.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
 module Prelude_LHAssumptions where
 
 import GHC.Base_LHAssumptions()
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		{-# OPTIONS_GHC -fplugin=LiquidHaskellBoot #-}
		module Foreign.Ptr_LHAssumptions where


Expand Down