[project @ 2005-02-01 00:52:20 by ross]

[ghc-base.git] / cbits / Makefile

diff --git a/cbits/Makefile b/cbits/Makefile
index 5eda815..b1bbba6 100644 (file)
--- 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