import CompManager ( cmInit, cmLoadModule )
import HscTypes ( GhciMode(..) )
import Config ( cBooterVersion, cGhcUnregisterised, cProjectVersion )
import CompManager ( cmInit, cmLoadModule )
import HscTypes ( GhciMode(..) )
import Config ( cBooterVersion, cGhcUnregisterised, cProjectVersion )
-import SysTools ( packageConfigPath, initSysTools, cleanTempFiles )
-import Packages ( showPackages, mungePackagePaths )
-import ParsePkgConf ( loadPackageConfig )
+import SysTools ( getPackageConfigPath, initSysTools, cleanTempFiles )
+import Packages ( showPackages )
import DriverPipeline ( GhcMode(..), doLink, doMkDLL, genPipeline,
getGhcMode, pipeLoop, v_GhcMode
import DriverPipeline ( GhcMode(..), doLink, doMkDLL, genPipeline,
getGhcMode, pipeLoop, v_GhcMode
findBuildTag, getPackageInfo, unregFlags,
v_Cmdline_libraries, v_Keep_tmp_files, v_Ld_inputs,
v_OptLevel, v_Output_file, v_Output_hi,
findBuildTag, getPackageInfo, unregFlags,
v_Cmdline_libraries, v_Keep_tmp_files, v_Ld_inputs,
v_OptLevel, v_Output_file, v_Output_hi,
- v_Package_details, v_Ways, getPackageExtraGhcOpts
+ v_Package_details, v_Ways, getPackageExtraGhcOpts,
+ readPackageConf
)
import DriverFlags ( dynFlag, buildStaticHscOpts, dynamic_flags,
processArgs, static_flags)
import DriverMkDepend ( beginMkDependHS, endMkDependHS )
)
import DriverFlags ( dynFlag, buildStaticHscOpts, dynamic_flags,
processArgs, static_flags)
import DriverMkDepend ( beginMkDependHS, endMkDependHS )
-import DriverPhases ( Phase(Hsc, HCc), haskellish_src_file, objish_file )
+import DriverPhases ( Phase(HsPp, Hsc, HCc), haskellish_src_file, objish_file )
import DriverUtil ( add, handle, handleDyn, later, splitFilename,
import DriverUtil ( add, handle, handleDyn, later, splitFilename,
import CmdLineOpts ( dynFlag, defaultDynFlags, restoreDynFlags,
saveDynFlags, setDynFlags,
DynFlags(..), HscLang(..), v_Static_hsc_opts
import CmdLineOpts ( dynFlag, defaultDynFlags, restoreDynFlags,
saveDynFlags, setDynFlags,
DynFlags(..), HscLang(..), v_Static_hsc_opts
case exception of
-- an IO exception probably isn't our fault, so don't panic
IOException _ -> hPutStr stderr (show exception)
case exception of
-- an IO exception probably isn't our fault, so don't panic
IOException _ -> hPutStr stderr (show exception)
- handleDyn (\dyn -> case dyn of
- PhaseFailed _phase code -> exitWith code
- Interrupted -> exitWith (ExitFailure 1)
- _ -> do hPutStrLn stderr (show (dyn :: GhcException))
- exitWith (ExitFailure 1)
+ handleDyn (\dyn -> do
+ hFlush stdout
+ case dyn of
+ PhaseFailed _phase code -> exitWith code
+ Interrupted -> exitWith (ExitFailure 1)
+ _ -> do hPutStrLn stderr (show (dyn :: GhcException))
+ exitWith (ExitFailure 1)
- conf_file <- packageConfigPath
- proto_pkg_details <- loadPackageConfig conf_file
- let pkg_details = mungePackagePaths top_dir proto_pkg_details
- writeIORef v_Package_details pkg_details
+ conf_file <- getPackageConfigPath
+ readPackageConf conf_file
-- find the phase to stop after (i.e. -E, -C, -c, -S flags)
(flags2, mode, stop_flag) <- getGhcMode argv'
writeIORef v_GhcMode mode
-- find the phase to stop after (i.e. -E, -C, -c, -S flags)
(flags2, mode, stop_flag) <- getGhcMode argv'
writeIORef v_GhcMode mode
-- process all the other arguments, and get the source files
non_static <- processArgs static_flags flags2 []
-- process all the other arguments, and get the source files
non_static <- processArgs static_flags flags2 []
-- leave out hscOutName for now
hscOutName = panic "Main.main:hscOutName not set",
-- leave out hscOutName for now
hscOutName = panic "Main.main:hscOutName not set",
when (verb >= 2)
(do hPutStr stderr "Glasgow Haskell Compiler, Version "
hPutStr stderr cProjectVersion
when (verb >= 2)
(do hPutStr stderr "Glasgow Haskell Compiler, Version "
hPutStr stderr cProjectVersion
let (basename, suffix) = splitFilename src
-- just preprocess (Haskell source only)
let (basename, suffix) = splitFilename src
-- just preprocess (Haskell source only)
- pp <- if not (haskellish_src_file src) || mode == StopBefore Hsc
- then return src else do
+ let src_and_suff = (src, getFileSuffix src)
+ let not_hs_file = not (haskellish_src_file src)
+ pp <- if not_hs_file || mode == StopBefore Hsc || mode == StopBefore HsPp
+ then return src_and_suff else do
- False{-not persistent-} defaultHscLang src
- pipeLoop phases src False{-no linking-} False{-no -o flag-}
+ False{-not persistent-} defaultHscLang
+ src_and_suff
+ pipeLoop phases src_and_suff False{-no linking-} False{-no -o flag-}
- phases <- genPipeline mode stop_flag True hsc_lang pp
- r <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL) True{-use -o flag-}
- basename suffix
+ phases <- genPipeline mode stop_flag True hsc_lang pp
+ (r,_) <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL)
+ True{-use -o flag-} basename suffix