X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FSysTools.lhs;h=83d833cb272a1d3aca63aee6aa28cf13f51f37c7;hb=9a972425548b14c2267e4a82fa1525314ebd7b06;hp=b8682aaf8cd496e6c048a5656e0deeca25639e7e;hpb=bd10e5c92533dcfa73a2c338bf4e13bfa10b67f7;p=ghc-hetmet.git diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs index b8682aa..83d833c 100644 --- a/ghc/compiler/main/SysTools.lhs +++ b/ghc/compiler/main/SysTools.lhs @@ -10,7 +10,18 @@ module SysTools ( -- Initialisation initSysTools, - setPgm, -- String -> IO () + + setPgmP, -- String -> IO () + setPgmF, + setPgmc, + setPgmm, + setPgms, + setPgma, + setPgml, +#ifdef ILX + setPgmI, + setPgmi, +#endif -- Command-line override setDryRun, @@ -19,6 +30,7 @@ module SysTools ( -- Interface to system tools runUnlit, runCpp, runCc, -- [Option] -> IO () + runPp, -- [Option] -> IO () runMangle, runSplit, -- [Option] -> IO () runAs, runLink, -- [Option] -> IO () runMkDLL, @@ -53,7 +65,7 @@ import DriverUtil import Config import Outputable import Panic ( progName, GhcException(..) ) -import Util ( global ) +import Util ( global, dropList, notNull ) import CmdLineOpts ( dynFlag, verbosity ) import Exception ( throwDyn ) @@ -73,24 +85,22 @@ import Addr #include "../includes/config.h" -#ifndef mingw32_TARGET_OS +#ifndef mingw32_HOST_OS import qualified Posix #else import List ( isPrefixOf ) import MarshalArray +import Foreign #endif --- This is a kludge for bootstrapping with 4.08.X. Given that --- all distributed compilers >= 5.0 will be compiled with themselves. --- I don't think this kludge is a problem. And we have to start --- building with >= 5.0 on Win32 anyway. #if __GLASGOW_HASKELL__ > 408 --- use the line below when we can be sure of compiling with GHC >= --- 5.02, and remove the implementation of rawSystem at the end of this --- file -import PrelIOBase -- this can be removed when SystemExts is used -import CError ( throwErrnoIfMinus1 ) -- as can this --- import SystemExts ( rawSystem ) +# if __GLASGOW_HASKELL__ >= 503 +import GHC.IOBase +# else +# endif +# ifdef mingw32_HOST_OS +import SystemExts ( rawSystem ) +# endif #else import System ( system ) #endif @@ -140,9 +150,9 @@ Config.hs contains two sorts of things etc They do *not* include paths - cUNLIT_DIR The *path* to the directory containing unlit, split etc - cSPLIT_DIR *relative* to the root of the build tree, - for use when running *in-place* in a build tree (only) + cUNLIT_DIR_REL The *path* to the directory containing unlit, split etc + cSPLIT_DIR_REL *relative* to the root of the build tree, + for use when running *in-place* in a build tree (only) @@ -182,6 +192,7 @@ All these pathnames are maintained IN THE NATIVE FORMAT OF THE HOST MACHINE. \begin{code} GLOBAL_VAR(v_Pgm_L, error "pgm_L", String) -- unlit GLOBAL_VAR(v_Pgm_P, error "pgm_P", String) -- cpp +GLOBAL_VAR(v_Pgm_F, error "pgm_F", String) -- pp GLOBAL_VAR(v_Pgm_c, error "pgm_c", String) -- gcc GLOBAL_VAR(v_Pgm_m, error "pgm_m", String) -- asm code mangler GLOBAL_VAR(v_Pgm_s, error "pgm_s", String) -- asm code splitter @@ -236,32 +247,33 @@ initSysTools minusB_args ; let installed, installed_bin :: FilePath -> FilePath installed_bin pgm = pgmPath top_dir pgm installed file = pgmPath top_dir file - inplace dir pgm = pgmPath (top_dir `slash` dir) pgm + inplace dir pgm = pgmPath (top_dir `slash` + cPROJECT_DIR `slash` dir) pgm ; let pkgconfig_path | am_installed = installed "package.conf" - | otherwise = inplace cGHC_DRIVER_DIR "package.conf.inplace" + | otherwise = inplace cGHC_DRIVER_DIR_REL "package.conf.inplace" ghc_usage_msg_path | am_installed = installed "ghc-usage.txt" - | otherwise = inplace cGHC_DRIVER_DIR "ghc-usage.txt" + | otherwise = inplace cGHC_DRIVER_DIR_REL "ghc-usage.txt" -- For all systems, unlit, split, mangle are GHC utilities -- architecture-specific stuff is done when building Config.hs unlit_path - | am_installed = installed_bin cGHC_UNLIT - | otherwise = inplace cGHC_UNLIT_DIR cGHC_UNLIT + | am_installed = installed_bin cGHC_UNLIT_PGM + | otherwise = inplace cGHC_UNLIT_DIR_REL cGHC_UNLIT_PGM -- split and mangle are Perl scripts split_script - | am_installed = installed_bin cGHC_SPLIT - | otherwise = inplace cGHC_SPLIT_DIR cGHC_SPLIT + | am_installed = installed_bin cGHC_SPLIT_PGM + | otherwise = inplace cGHC_SPLIT_DIR_REL cGHC_SPLIT_PGM mangle_script - | am_installed = installed_bin cGHC_MANGLER - | otherwise = inplace cGHC_MANGLER_DIR cGHC_MANGLER + | am_installed = installed_bin cGHC_MANGLER_PGM + | otherwise = inplace cGHC_MANGLER_DIR_REL cGHC_MANGLER_PGM -#ifndef mingw32_TARGET_OS +#ifndef mingw32_HOST_OS -- check whether TMPDIR is set in the environment ; IO.try (do dir <- getEnv "TMPDIR" -- fails if not set setTmpDir dir @@ -279,11 +291,11 @@ initSysTools minusB_args tdir <- if ret == 0 then do -- failed, consult TEMP. - destructArray len buf + free buf getEnv "TMP" else do s <- peekCString buf - destructArray len buf + free buf return s let -- strip the trailing backslash (awful, but @@ -303,7 +315,7 @@ initSysTools minusB_args throwDyn (InstallationError ("Can't find package.conf as " ++ pkgconfig_path)) -#if defined(mingw32_TARGET_OS) +#if defined(mingw32_HOST_OS) -- WINDOWS-SPECIFIC STUFF -- On Windows, gcc and friends are distributed with GHC, -- so when "installed" we look in TopDir/bin @@ -332,22 +344,26 @@ initSysTools minusB_args | otherwise = cGHC_PERL -- 'touch' is a GHC util for Windows, and similarly unlit, mangle - ; let touch_path | am_installed = installed_bin cGHC_TOUCHY - | otherwise = inplace cGHC_TOUCHY_DIR cGHC_TOUCHY + ; let touch_path | am_installed = installed_bin cGHC_TOUCHY_PGM + | otherwise = inplace cGHC_TOUCHY_DIR_REL cGHC_TOUCHY_PGM -- On Win32 we don't want to rely on #!/bin/perl, so we prepend -- a call to Perl to get the invocation of split and mangle ; let split_path = perl_path ++ " \"" ++ split_script ++ "\"" mangle_path = perl_path ++ " \"" ++ mangle_script ++ "\"" - ; let mkdll_path = cMKDLL + ; let mkdll_path + | am_installed = pgmPath (installed "gcc-lib/") cMKDLL ++ + " --dlltool-name " ++ pgmPath (installed "gcc-lib/") "dlltool" ++ + " --driver-name " ++ gcc_path + | otherwise = cMKDLL #else -- UNIX-SPECIFIC STUFF -- On Unix, the "standard" tools are assumed to be -- in the same place whether we are running "in-place" or "installed" -- That place is wherever the build-time configure script found them. ; let gcc_path = cGCC - touch_path = cGHC_TOUCHY + touch_path = "touch" mkdll_path = panic "Can't build DLLs on a non-Win32 system" -- On Unix, scripts are invoked using the '#!' method. Binary @@ -385,6 +401,7 @@ initSysTools minusB_args ; writeIORef v_Pgm_L unlit_path ; writeIORef v_Pgm_P cpp_path + ; writeIORef v_Pgm_F "" ; writeIORef v_Pgm_c gcc_path ; writeIORef v_Pgm_m mangle_path ; writeIORef v_Pgm_s split_path @@ -401,31 +418,30 @@ initSysTools minusB_args ; return () } -#if defined(mingw32_TARGET_OS) -foreign import stdcall "GetTempPathA" getTempPath :: Int -> CString -> IO Int32 +#if defined(mingw32_HOST_OS) +foreign import stdcall "GetTempPathA" unsafe getTempPath :: Int -> CString -> IO Int32 #endif \end{code} -setPgm is called when a command-line option like +The various setPgm functions are called when a command-line option +like + -pgmLld + is used to override a particular program with a new one \begin{code} -setPgm :: String -> IO () --- The string is the flag, minus the '-pgm' prefix --- So the first character says which program to override - -setPgm ('P' : pgm) = writeIORef v_Pgm_P pgm -setPgm ('c' : pgm) = writeIORef v_Pgm_c pgm -setPgm ('m' : pgm) = writeIORef v_Pgm_m pgm -setPgm ('s' : pgm) = writeIORef v_Pgm_s pgm -setPgm ('a' : pgm) = writeIORef v_Pgm_a pgm -setPgm ('l' : pgm) = writeIORef v_Pgm_l pgm +setPgmP = writeIORef v_Pgm_P +setPgmF = writeIORef v_Pgm_F +setPgmc = writeIORef v_Pgm_c +setPgmm = writeIORef v_Pgm_m +setPgms = writeIORef v_Pgm_s +setPgma = writeIORef v_Pgm_a +setPgml = writeIORef v_Pgm_l #ifdef ILX -setPgm ('I' : pgm) = writeIORef v_Pgm_I pgm -setPgm ('i' : pgm) = writeIORef v_Pgm_i pgm +setPgmI = writeIORef v_Pgm_I +setPgmi = writeIORef v_Pgm_i #endif -setPgm pgm = unknownFlagErr ("-pgm" ++ pgm) \end{code} @@ -463,7 +479,7 @@ findTopDir minusbs } where -- get_proto returns a Unix-format path (relying on getExecDir to do so too) - get_proto | not (null minusbs) + get_proto | notNull minusbs = return (unDosifyPath (drop 2 (last minusbs))) -- 2 for "-B" | otherwise = do { maybe_exec_dir <- getExecDir -- Get directory of executable @@ -501,20 +517,13 @@ showOptions ls = unwords (map (quote.showOpt) ls) showOpt (FileOption pre f) = pre ++ dosifyPath f showOpt (Option s) = s -#if defined(mingw32_TARGET_OS) - quote "" = "" - quote s = "\"" ++ s ++ "\"" -#else - quote = id -#endif - \end{code} %************************************************************************ %* * \subsection{Running an external program} -n%* * +%* * %************************************************************************ @@ -527,6 +536,10 @@ runCpp :: [Option] -> IO () runCpp args = do p <- readIORef v_Pgm_P runSomething "C pre-processor" p args +runPp :: [Option] -> IO () +runPp args = do p <- readIORef v_Pgm_F + runSomething "Haskell pre-processor" p args + runCc :: [Option] -> IO () runCc args = do p <- readIORef v_Pgm_c runSomething "C Compiler" p args @@ -688,7 +701,7 @@ runSomething :: String -- For -v message runSomething phase_name pgm args = traceCmd phase_name cmd_line $ do { -#ifndef mingw32_TARGET_OS +#ifndef mingw32_HOST_OS exit_code <- system cmd_line #else exit_code <- rawSystem cmd_line @@ -698,14 +711,9 @@ runSomething phase_name pgm args else return () } where - cmd_line = pgm ++ ' ':showOptions args -- unwords (pgm : dosifyPaths (map quote args)) -- The pgm is already in native format (appropriate dir separators) -#if defined(mingw32_TARGET_OS) - quote "" = "" - quote s = "\"" ++ s ++ "\"" -#else - quote = id -#endif + cmd_line = pgm ++ ' ':showOptions args + -- unwords (pgm : dosifyPaths (map quote args)) traceCmd :: String -> String -> IO () -> IO () -- a) trace the command (at two levels of verbosity) @@ -764,7 +772,7 @@ pgmPath :: String -- Directory string in Unix format -#if defined(mingw32_TARGET_OS) +#if defined(mingw32_HOST_OS) --------------------- Windows version ------------------ dosifyPaths xs = map dosifyPath xs @@ -781,7 +789,7 @@ dosifyPath stuff cygdrive_prefix = "/cygdrive/" real_stuff - | cygdrive_prefix `isPrefixOf` stuff = drop (length cygdrive_prefix) stuff + | cygdrive_prefix `isPrefixOf` stuff = dropList cygdrive_prefix stuff | otherwise = stuff #else @@ -824,43 +832,45 @@ slash s1 s2 = s1 ++ ('/' : s2) ----------------------------------------------------------------------------- -- Define getExecDir :: IO (Maybe String) -#if defined(mingw32_TARGET_OS) +#if defined(mingw32_HOST_OS) getExecDir :: IO (Maybe String) getExecDir = do let len = (2048::Int) -- plenty, PATH_MAX is 512 under Win32. buf <- mallocArray len ret <- getModuleFileName nullAddr buf len - if ret == 0 then destructArray len buf >> return Nothing + if ret == 0 then free buf >> return Nothing else do s <- peekCString buf - destructArray len buf - return (Just (reverse (drop (length "/bin/ghc.exe") (reverse (unDosifyPath s))))) + free buf + return (Just (reverse (dropList "/bin/ghc.exe" (reverse (unDosifyPath s))))) -foreign import stdcall "GetModuleFileNameA" getModuleFileName :: Addr -> CString -> Int -> IO Int32 +foreign import stdcall "GetModuleFileNameA" unsafe getModuleFileName :: Addr -> CString -> Int -> IO Int32 #else getExecDir :: IO (Maybe String) = do return Nothing #endif -#ifdef mingw32_TARGET_OS -foreign import "_getpid" getProcessID :: IO Int -- relies on Int == Int32 on Windows +#ifdef mingw32_HOST_OS +foreign import "_getpid" unsafe getProcessID :: IO Int -- relies on Int == Int32 on Windows #else getProcessID :: IO Int getProcessID = Posix.getProcessID #endif +#if defined(mingw32_HOST_OS) && (__GLASGOW_HASKELL__ <= 408) rawSystem :: String -> IO ExitCode -#if __GLASGOW_HASKELL__ > 408 -rawSystem "" = ioException (IOError Nothing InvalidArgument "rawSystem" "null command" Nothing) -rawSystem cmd = - withCString cmd $ \s -> do - status <- throwErrnoIfMinus1 "rawSystem" (primRawSystem s) - case status of - 0 -> return ExitSuccess - n -> return (ExitFailure n) - -foreign import ccall "rawSystemCmd" unsafe primRawSystem :: CString -> IO Int -#else -rawSystem = System.system +rawSystem cmd = system cmd + -- mingw only: if you try to build a stage2 compiler with a stage1 + -- that has been bootstrapped with 4.08 (or earlier), this will run + -- into problems with limits on command-line lengths with the std. + -- Win32 command interpreters. So don't this - use 5.00 or later + -- to compile up the GHC sources. #endif +quote :: String -> String +#if defined(mingw32_HOST_OS) +quote "" = "" +quote s = "\"" ++ s ++ "\"" +#else +quote s = s +#endif \end{code}