[project @ 2003-05-30 22:29:41 by wolfgang]

[ghc-hetmet.git] / ghc / compiler / main / DriverPipeline.hs

diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index 8b705a1..2482aaa 100644 (file)
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -736,7 +736,7 @@ run_phase Hsc basename suff input_fn output_fn
        writeIORef v_Include_paths (current_dir : paths)
        
   -- gather the imports and module name
-        (srcimps,imps,mod_name) <- 
+        (_,_,mod_name) <- 
             if extcoreish_suffix suff
             then do
                -- no explicit imports in ExtCore input.
@@ -771,7 +771,7 @@ run_phase Hsc basename suff input_fn output_fn
                   -- THIS COMPILATION, then use that to determine if the 
                   -- source is unchanged.
                | Just x <- expl_o_file, todo == StopBefore Ln  =  x
-               | otherwise = expectJust "source_unchanged" (ml_obj_file location)
+               | otherwise = ml_obj_file location
 
        source_unchanged <- 
           if not (do_recomp && ( todo == DoLink || todo == StopBefore Ln ))
@@ -812,7 +812,7 @@ run_phase Hsc basename suff input_fn output_fn
             HscNoRecomp pcs details iface -> do { SysTools.touch "Touching object file" o_file
                                                ; return Nothing } ;
 
-           HscRecomp pcs details iface stub_h_exists stub_c_exists
+           HscRecomp _pcs _details _iface stub_h_exists stub_c_exists
                      _maybe_interpreted_code -> do
 
                            -- deal with stubs
@@ -1156,10 +1156,10 @@ staticLink o_files dep_packages = do
     let framework_path_opts = map ("-F"++) framework_paths
 
     pkg_frameworks <- getPackageFrameworks dep_packages
-    let pkg_framework_opts = map ("-framework " ++) pkg_frameworks
+    let pkg_framework_opts = concat [ ["-framework", fw] | fw <- pkg_frameworks ]
 
     frameworks <- readIORef v_Cmdline_frameworks
-    let framework_opts = map ("-framework "++) (reverse frameworks)
+    let framework_opts = concat [ ["-framework", fw] | fw <- reverse frameworks ]
         -- reverse because they're added in reverse order from the cmd line
 #endif