From 9ca863b061907f4b691d2fd4166f0ff9cf90b079 Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 6 Feb 2002 10:40:26 +0000 Subject: [PATCH] [project @ 2002-02-06 10:40:26 by simonmar] Building the cbits library is simpler with UseGhcForCC=YES. --- cbits/Makefile | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/cbits/Makefile b/cbits/Makefile index 6593040..5b5979a 100644 --- a/cbits/Makefile +++ b/cbits/Makefile @@ -1,23 +1,17 @@ -# $Id: Makefile,v 1.3 2001/08/17 12:50:34 simonmar Exp $ +# $Id: Makefile,v 1.4 2002/02/06 10:40:26 simonmar Exp $ + +UseGhcForCc = YES TOP = ../.. include $(TOP)/mk/boilerplate.mk -PACKAGE = core -IS_CBITS_LIB = YES - -SRC_CC_OPTS += -Wall -DCOMPILING_STDLIB -I../include -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) +HC = $(GHC_INPLACE) -ifeq "$(ILXized)" "YES" -DLLized = YES -C_SRCS += $(FPTOOLS_TOP)/ghc/rts/StgPrimFloat.c -else -C_SRCS := $(filter-out ilxstubs.c,$(C_SRCS)) -endif +EXCLUDED_SRCS += ilxstubs.c -# ----------------------------------------------------------------------------- -# Installation +SRC_CC_OPTS += -Wall -DCOMPILING_STDLIB -I$(GHC_RUNTIME_DIR) -INSTALL_DATAS += lockFile.h +LIBRARY = libHSbase_cbits.a +LIBOBJS = $(C_OBJS) include $(TOP)/mk/target.mk -- 1.7.10.4