diff options
| author | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2019-06-26 14:25:30 +0300 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-07-02 16:19:59 -0400 |
| commit | 60b9eab9ffa7560334ef886ae1a0461d55a95f9a (patch) | |
| tree | 40e8e71abb9b48572a5f6afc52c9c194f7037f06 | |
| parent | 294b55dcff51fb9e419889d7262c7f053c919623 (diff) | |
| download | haskell-60b9eab9ffa7560334ef886ae1a0461d55a95f9a.tar.gz | |
Fix stage 1 warnings
| -rw-r--r-- | compiler/main/DynFlags.hs | 3 | ||||
| -rw-r--r-- | ghc/Main.hs | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 84091b3abc..b5fb200802 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -320,7 +320,8 @@ import qualified EnumSet import GHC.Foreign (withCString, peekCString) import qualified GHC.LanguageExtensions as LangExt -#if defined(HAVE_INTERPRETER) +#if STAGE >= 2 +-- used by SHARED_GLOBAL_VAR import Foreign (Ptr) #endif diff --git a/ghc/Main.hs b/ghc/Main.hs index ce0aaec6e9..614b45f277 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -31,11 +31,14 @@ import GHCi.UI ( interactiveUI, ghciWelcomeMsg, defaultGhciSettings ) -- Frontend plugins #if defined(HAVE_INTERPRETER) -import DynamicLoading ( loadFrontendPlugin, initializePlugins ) +import DynamicLoading ( loadFrontendPlugin ) import Plugins #else import DynamicLoading ( pluginError ) #endif +#if defined(HAVE_INTERNAL_INTERPRETER) +import DynamicLoading ( initializePlugins ) +#endif import Module ( ModuleName ) |