[project @ 2000-08-18 04:04:48 by qrczak]

Output -#include options before packages' C includes, to be able to
-#include a file that #defines e.g. _XOPEN_SOURCE and #includes a C
header depending on _XOPEN_SOURCE that is also included from Stg.h.
First inclusion of this header should be after the #define.

diff --git a/ghc/driver/Main.hs b/ghc/driver/Main.hs
index 87d7c81..71e0e67 100644 (file)
--- a/ghc/driver/Main.hs
+++ b/ghc/driver/Main.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -W #-}
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.53 2000/08/09 09:56:08 simonmar Exp $
+-- $Id: Main.hs,v 1.54 2000/08/18 04:04:48 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 
-                                       (c_includes ++ reverse cmdline_includes))
+                                       (reverse cmdline_includes ++ c_includes))
                       | otherwise = ""
            mk_include h_file = 
                case h_file of