diff options
| author | Gabor Greif <ggreif@gmail.com> | 2017-01-12 17:44:38 +0100 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2017-01-13 18:13:45 +0100 |
| commit | a62701f26e191d2e21c543e702ff1f3c795033c7 (patch) | |
| tree | 1277f64ca2d1ab45fdb6ea82fecfe150188725c1 /compiler/main | |
| parent | 8b6fa4f14f4d4f4a584e2d3d603271057f76e25a (diff) | |
| download | haskell-a62701f26e191d2e21c543e702ff1f3c795033c7.tar.gz | |
Simplify CPP logic as we now need v7.10 for bootstrapping
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 7 | ||||
| -rw-r--r-- | compiler/main/StaticFlags.hs | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 8d50e01905..c8f6e1ed43 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -214,12 +214,7 @@ import qualified Data.IntSet as IntSet import GHC.Foreign (withCString, peekCString) import qualified GHC.LanguageExtensions as LangExt -#if __GLASGOW_HASKELL__ >= 709 -import Foreign -#else -import Foreign.Safe -#endif - +import Foreign (Ptr) -- needed for 2nd stage -- Note [Updating flag description in the User's Guide] -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index af8f4e64d4..b5be9ba1ac 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -48,12 +48,7 @@ import Control.Monad import Data.IORef import System.IO.Unsafe ( unsafePerformIO ) -#if __GLASGOW_HASKELL__ >= 709 -import Foreign -#else -import Foreign.Safe -#endif - +import Foreign (Ptr) -- needed for 2nd stage ----------------------------------------------------------------------------- -- Static flags |