[commit: ghc] wip/angerman/llvmng: Even more sharing. (ae6f4c7)

git at git.haskell.org git at git.haskell.org
Sat Nov 11 08:36:03 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/angerman/llvmng
Link       : http://ghc.haskell.org/trac/ghc/changeset/ae6f4c7df1d251a4381509d675cd3aa973097027/ghc

>---------------------------------------------------------------

commit ae6f4c7df1d251a4381509d675cd3aa973097027
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sat Nov 11 15:24:28 2017 +0800

    Even more sharing.


>---------------------------------------------------------------

ae6f4c7df1d251a4381509d675cd3aa973097027
 compiler/main/SysTools.hs          | 1 -
 libraries/ghc-boot/GHC/BasePath.hs | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 4fe6fe8..07ffea7 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -48,7 +48,6 @@ import Platform
 import Util
 import DynFlags
 
-import System.Environment (getExecutablePath)
 import System.FilePath
 import System.IO
 import System.Directory
diff --git a/libraries/ghc-boot/GHC/BasePath.hs b/libraries/ghc-boot/GHC/BasePath.hs
index dbe41fb..7a44749 100644
--- a/libraries/ghc-boot/GHC/BasePath.hs
+++ b/libraries/ghc-boot/GHC/BasePath.hs
@@ -1,6 +1,9 @@
 {-# LANGUAGE CPP #-}
 module GHC.BasePath (getBaseDir) where
 
+import System.Environment (getExecutablePath)
+import System.FilePath
+
 #if defined(mingw32_HOST_OS)
 #if MIN_VERSION_Win32(2,5,0)
 import qualified System.Win32.Types as Win32
@@ -27,6 +30,8 @@ import System.Win32.DLL (loadLibrary, getProcAddress)
 # endif
 #endif
 
+-- | getBaseDir tries to find the base path (@$topdir@), assuming the executable is in @$topdir/bin/@
+-- and the base path is @$topdir/lib at .
 getBaseDir :: [String] -> IO (Maybe String)
 #if defined(mingw32_HOST_OS)
 -- Assuming we are running ghc, accessed by path  $(stuff)/<foo>/ghc.exe,



More information about the ghc-commits mailing list