[project @ 2000-08-18 06:42:37 by qrczak]

Oops, #include reordering does not work if -#include refers to names
from Stg.h. Changes reverted. The original problem requires -optc-Dfoo
workaround.

diff --git a/ghc/driver/Main.hs b/ghc/driver/Main.hs
index 71e0e67..a5e3c82 100644 (file)
--- a/ghc/driver/Main.hs
+++ b/ghc/driver/Main.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -W #-}
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.54 2000/08/18 04:04:48 qrczak Exp $
+-- $Id: Main.hs,v 1.55 2000/08/18 06:42:37 qrczak Exp $
 --
 -- GHC Driver program
 --
@@ -1828,7 +1828,7 @@ run_phase cc_phase _basename _suff input_fn output_fn
        cmdline_includes <- readState cmdline_hc_includes -- -#include options
 
        let cc_injects | hcc = unlines (map mk_include 
-                                       (reverse cmdline_includes ++ c_includes))
+                                       (c_includes ++ reverse cmdline_includes))
                       | otherwise = ""
            mk_include h_file = 
                case h_file of