[commit: ghc] master: Building GHC with hadrian on FreeBSD (6551797)

git at git.haskell.org git at git.haskell.org
Sat Nov 17 12:52:47 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/65517979adf03a1fa5d33d34e419e7dfc9444002/ghc

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

commit 65517979adf03a1fa5d33d34e419e7dfc9444002
Author: Krzysztof Gogolewski <krz.gogolewski at gmail.com>
Date:   Sat Nov 17 12:21:51 2018 +0100

    Building GHC with hadrian on FreeBSD
    
    Summary: I'm currently trying to make `hadrian` work as a build system
    on FreeBSD (https://ghc.haskell.org/trac/ghc/ticket/15860).
    I'm still having some issues with `libgmp` but one can get a working
    `ghc` using `--integer-simple` and this patch.
    
    Reviewers: bgamari, erikd, alpmestan
    
    Reviewed By: alpmestan
    
    Subscribers: rwbarton, carter
    
    Differential Revision: https://phabricator.haskell.org/D5335


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

65517979adf03a1fa5d33d34e419e7dfc9444002
 compiler/main/SysTools/BaseDir.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/main/SysTools/BaseDir.hs b/compiler/main/SysTools/BaseDir.hs
index 16f5a44..786b0e4 100644
--- a/compiler/main/SysTools/BaseDir.hs
+++ b/compiler/main/SysTools/BaseDir.hs
@@ -27,7 +27,7 @@ import System.FilePath
 import Data.List
 
 -- POSIX
-#if defined(darwin_HOST_OS) || defined(linux_HOST_OS)
+#if defined(darwin_HOST_OS) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS)
 import System.Environment (getExecutablePath)
 #endif
 
@@ -136,7 +136,7 @@ rootDir :: FilePath -> FilePath
 rootDir = takeDirectory . takeDirectory . normalise
 
 getBaseDir = Just . (\p -> p </> "lib") . rootDir <$> getExecutablePath
-#elif defined(darwin_HOST_OS) || defined(linux_HOST_OS)
+#elif defined(darwin_HOST_OS) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS)
 -- on unix, this is a bit more confusing.
 -- The layout right now is something like
 --



More information about the ghc-commits mailing list