Commit 52e597cd authored by simonmar's avatar simonmar
Browse files

[project @ 2001-06-28 11:51:52 by simonmar]

clean up remove_suffix:

  - only use it when getExecDir works (i.e. on Windows)
  - therefore, don't require that the build-tree TOPDIR has a
    /ghc/compiler suffix.
  - fix a bug with the installed build, where the binary lives
    in $libdir/bin not $libdir.

ghci-inplace should work again now.
parent 65eb7abe
......@@ -56,7 +56,6 @@ import IOExts ( IORef, readIORef, writeIORef )
import Monad ( when, unless )
import System ( system, ExitCode(..), exitWith )
import CString
import Addr
import Int
#if __GLASGOW_HASKELL__ < 500
......@@ -70,10 +69,12 @@ import MarshalArray
#if !defined(mingw32_TARGET_OS)
import qualified Posix
#else
import Addr ( nullAddr )
import Addr
import List ( isPrefixOf )
#endif
import List ( isSuffixOf )
#include "HsVersions.h"
{-# DEPRECATED runSomething "runSomething should be private to SysTools" #-}
......@@ -330,10 +331,7 @@ getTopDir minusbs
-- by looking for the package configuration file.
; am_installed <- doesFileExist (top_dir2 `slash` "package.conf")
; if am_installed then
return (True, top_dir2)
else
return (False, remove_suffix top_dir2)
; return (am_installed, top_dir2)
}
where
get_proto | not (null minusbs)
......@@ -343,19 +341,23 @@ getTopDir minusbs
; case maybe_exec_dir of -- (only works on Windows;
-- returns Nothing on Unix)
Nothing -> throwDyn (InstallationError "missing -B<dir> option")
Just dir -> return dir
Just dir -> return (remove_suffix dir)
}
remove_suffix dir -- "/...stuff.../ghc/compiler" --> "/...stuff..."
= ASSERT2( not (null p1) &&
not (null p2) &&
dir == top_dir ++ "/ghc/compiler",
text dir )
top_dir
-- In an installed tree, the ghc binary lives in $libexecdir, which
-- is normally $libdir/bin. So we strip off a /bin suffix here.
-- In a build tree, the ghc binary lives in $fptools/ghc/compiler,
-- so we strip off the /ghc/compiler suffix here too, leaving a
-- standard TOPDIR.
remove_suffix ghc_bin_dir -- ghc_bin_dir is in standard Unix format
| "/ghc/compiler" `isSuffixOf` ghc_bin_dir = back_two
| "/bin" `isSuffixOf` ghc_bin_dir = back_one
| otherwise = ghc_bin_dir
where
p1 = dropWhile (not . isSlash) (reverse dir)
p1 = dropWhile (not . isSlash) (reverse ghc_bin_dir)
p2 = dropWhile (not . isSlash) (tail p1) -- head is '/'
top_dir = reverse (tail p2) -- head is '/'
back_two = reverse (tail p2) -- head is '/'
back_one = reverse (tail p1)
\end{code}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment