From 60b9eab9ffa7560334ef886ae1a0461d55a95f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Sinan=20A=C4=9Facan?= <omeragacan@gmail.com> Date: Wed, 26 Jun 2019 14:25:30 +0300 Subject: [PATCH] Fix stage 1 warnings --- compiler/main/DynFlags.hs | 3 ++- ghc/Main.hs | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 84091b3abc2c..b5fb2008021b 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 ce0aaec6e902..614b45f27727 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 ) -- GitLab