From f864a5eae8262752162c6b0d124aea4601ed9ac1 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Mon, 18 Sep 2017 01:23:22 +0200 Subject: Fix literally everything :) Sorry for the megacommit - Seperate modules into: - Compiletime, modules which are only used while building the package - Runtime, modues included in the wrapper binary to be compiled on the users machine at runtime - Shared, modues used in both contexts - Refactor runtime compilation - Completely revamp output paths - Don't chdir when invoking ghc - Require cabal-version 1.14 in cabal file --- Distribution/Helper.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Distribution') diff --git a/Distribution/Helper.hs b/Distribution/Helper.hs index 7f34b09..7bd76e9 100644 --- a/Distribution/Helper.hs +++ b/Distribution/Helper.hs @@ -96,8 +96,8 @@ import GHC.Generics import Prelude import Paths_cabal_helper (getLibexecDir) -import CabalHelper.Types hiding (Options(..)) -import CabalHelper.Sandbox +import CabalHelper.Shared.Types hiding (Options(..)) +import CabalHelper.Shared.Sandbox -- | Paths or names of various programs we need. data Programs = Programs { @@ -394,12 +394,12 @@ getSandboxPkgDb :: (FilePath -> [String] -> String -> IO String) -- ^ GHC version (@cProjectVersion@ is your friend) -> IO (Maybe FilePath) getSandboxPkgDb readProc = - CabalHelper.Sandbox.getSandboxPkgDb $ unsafePerformIO $ buildPlatform readProc + CabalHelper.Shared.Sandbox.getSandboxPkgDb $ unsafePerformIO $ buildPlatform readProc buildPlatform :: (FilePath -> [String] -> String -> IO String) -> IO String buildPlatform readProc = do exe <- findLibexecExe - CabalHelper.Sandbox.dropWhileEnd isSpace <$> readProc exe ["print-build-platform"] "" + CabalHelper.Shared.Sandbox.dropWhileEnd isSpace <$> readProc exe ["print-build-platform"] "" -- | This exception is thrown by all 'runQuery' functions if the internal -- wrapper executable cannot be found. You may catch this and present the user -- cgit v1.2.3