X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=cbits%2FMakefile;h=b1bbba6ebc4526169f71a59ffefdda4ad8c4a526;hb=e9e2a5412bb7cda8d13a063ac403d9f18ac97380;hp=5eda815477ab6c26c31dd45aa332ce8a9bd756fb;hpb=7dae72bf8bf76e9085930bfe402d5d2d1a2875b2;p=ghc-base.git

diff --git a/cbits/Makefile b/cbits/Makefile
index 5eda815..b1bbba6 100644
--- a/cbits/Makefile
+++ b/cbits/Makefile
@@ -1,17 +1,23 @@
-# $Id: Makefile,v 1.7 2002/02/14 15:14:02 simonmar Exp $
+# $Id: Makefile,v 1.14 2005/02/01 00:52:22 ross Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
+-include ../config.mk
 
 HC = $(GHC_INPLACE)
 
+UseGhcForCc = YES
+
+# If there is no system-supplied POSIX regex library, use our own
 ifneq "$(HavePosixRegex)" "YES"
 ALL_DIRS      += regex
 SRC_CC_OPTS   += -Iregex
 EXCLUDED_SRCS += regex/engine.c
 endif
 
-EXCLUDED_SRCS += ilxstubs.c
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+EXCLUDED_SRCS += consUtils.c
+endif
 
 SRC_CC_OPTS += -Wall -DCOMPILING_STDLIB 
 SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) -I../include