[project @ 2004-08-16 11:07:31 by simonmar]

More ugly hacks related to the config.h change.  I'm beginning to
think maybe this wasn't such a great idea.

diff --git a/cbits/Makefile b/cbits/Makefile
index dd6a6ae..2a6ac7d 100644 (file)
--- a/cbits/Makefile
+++ b/cbits/Makefile
@@ -1,10 +1,12 @@
-# $Id: Makefile,v 1.9 2003/10/20 13:16:58 simonmar Exp $
+# $Id: Makefile,v 1.10 2004/08/16 11:07:31 simonmar Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 HC = $(GHC_INPLACE)
 
+UseGhcForCc = YES
+
 # If there is no system-supplied POSIX regex library, use our own
 ifneq "$(HavePosixRegex)" "YES"
 ALL_DIRS      += regex
@@ -19,7 +21,7 @@ EXCLUDED_SRCS += consUtils.c
 endif
 
 SRC_CC_OPTS += -Wall -DCOMPILING_STDLIB 
-SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) -I../include
+SRC_CC_OPTS += -I$(GHC_RUNTIME_DIR) -I../include
 
 LIBRARY = libHSbase_cbits.a
 LIBOBJS = $(C_OBJS)

diff --git a/cbits/rawSystem.c b/cbits/rawSystem.c
index 7a8f1a8..0a31546 100644 (file)
--- a/cbits/rawSystem.c
+++ b/cbits/rawSystem.c
@@ -10,11 +10,13 @@
 /* This ifdef is required because this source might be compiled by an
  * external compiler.  See ghc/utils/runghc/rawSystem.c for example.
  */
+#ifdef __GLASGOW_HASKELL__
 #if __GLASGOW_HASKELL__ < 603
 #include "config.h"
 #else
 #include "ghcconfig.h"
 #endif
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>