projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-04-30 10:51:18 by simonpj]
[ghc-hetmet.git]
/
ghc
/
compiler
/
main
/
DriverState.hs
diff --git
a/ghc/compiler/main/DriverState.hs
b/ghc/compiler/main/DriverState.hs
index
62a7976
..
522330e
100644
(file)
--- a/
ghc/compiler/main/DriverState.hs
+++ b/
ghc/compiler/main/DriverState.hs
@@
-1,5
+1,5
@@
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
--- $Id: DriverState.hs,v 1.34 2001/03/22 03:51:08 hwloidl Exp $
+-- $Id: DriverState.hs,v 1.37 2001/03/28 11:01:19 simonmar Exp $
--
-- Settings for the driver
--
--
-- Settings for the driver
--
@@
-37,7
+37,7
@@
cHaskell1Version = "5" -- i.e., Haskell 98
-- Global compilation flags
-- location of compiler-related files
-- Global compilation flags
-- location of compiler-related files
-GLOBAL_VAR(v_TopDir, clibdir, String)
+GLOBAL_VAR(v_TopDir, error "no TOPDIR", String)
-- Cpp-related flags
v_Hs_source_cpp_opts = global
-- Cpp-related flags
v_Hs_source_cpp_opts = global
@@
-322,6
+322,8
@@
addToDirList ref path
= do paths <- readIORef ref
writeIORef ref (paths ++ split split_marker path)
= do paths <- readIORef ref
writeIORef ref (paths ++ split split_marker path)
+GLOBAL_VAR(v_HCHeader, "", String)
+
-----------------------------------------------------------------------------
-- Packages
-----------------------------------------------------------------------------
-- Packages
@@
-334,7
+336,7
@@
addPackage :: String -> IO ()
addPackage package
= do pkg_details <- readIORef v_Package_details
case lookupPkg package pkg_details of
addPackage package
= do pkg_details <- readIORef v_Package_details
case lookupPkg package pkg_details of
- Nothing -> throwDyn (OtherError ("unknown package name: " ++ package))
+ Nothing -> throwDyn (CmdLineError ("unknown package name: " ++ package))
Just details -> do
ps <- readIORef v_Packages
unless (package `elem` ps) $ do
Just details -> do
ps <- readIORef v_Packages
unless (package `elem` ps) $ do
@@
-468,7
+470,7
@@
findBuildTag = do
return (wayOpts details)
ws -> if not (allowed_combination ws)
return (wayOpts details)
ws -> if not (allowed_combination ws)
- then throwDyn (OtherError $
+ then throwDyn (CmdLineError $
"combination not supported: " ++
foldr1 (\a b -> a ++ '/':b)
(map (wayName . lkupWay) ws))
"combination not supported: " ++
foldr1 (\a b -> a ++ '/':b)
(map (wayName . lkupWay) ws))