[project @ 2001-08-04 06:11:24 by ken]

[ghc-hetmet.git] / ghc / utils / hsc2hs / Makefile

diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index 0f70d89..5595d5b 100644 (file)
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.11 2001/03/14 12:13:02 rrt Exp $
+# $Id: Makefile,v 1.20 2001/08/01 20:37:00 qrczak Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -11,6 +11,8 @@ INSTALLING=1
 
 HS_PROG           = hsc2hs-bin
 SRC_HC_OPTS      += -package util
+# TODO: remove -H80M when the strictness analyser is working again.
+Main_HC_OPTS      = -H80M
 
 INSTALLED_SCRIPT_PROG  = hsc2hs
 INPLACE_SCRIPT_PROG    = hsc2hs-inplace
@@ -25,25 +27,29 @@ endif
 
 ifeq "$(INSTALLING)" "1"
 ifeq "$(BIN_DIST)"   "1"
+HSC2HS_BINDIR=$$\"\"libexecdir
 HSC2HS_DIR=$$\"\"libdir
 HSC2HS_EXTRA=
 else
+HSC2HS_BINDIR=$(libexecdir)
 HSC2HS_DIR=$(libdir)
 HSC2HS_EXTRA=--cc=$(bindir)/ghc-$(ProjectVersion)
 endif # BIN_DIST
 else
+HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
 HSC2HS_DIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HSC2HS_EXTRA="--cc=$(CC) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
 else
-HSC2HS_EXTRA="--cc=$(CC) --cflag=-mno-cygwin --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
+extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
+HSC2HS_EXTRA="--cc=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
 endif
 endif
 
 $(SCRIPT_PROG) : Makefile
 $(INSTALLED_SCRIPT_PROG) : $(TOP)/mk/config.mk
 
-SCRIPT_SUBST_VARS = HSC2HS_DIR HS_PROG HSC2HS_EXTRA
+SCRIPT_SUBST_VARS = HSC2HS_BINDIR HSC2HS_DIR HS_PROG HSC2HS_EXTRA
 
 SCRIPT_OBJS=hsc2hs.sh
 INTERP=$(SHELL)
@@ -57,7 +63,6 @@ INSTALL_DATAS += template-hsc.h
 # -----------------------------------------------------------------------------
 # Create driver configuration
 
-CURRENT_DIR=ghc/utils/hsc2hs
 CONFIG_HS = Config.hs
 boot :: $(CONFIG_HS)
 
@@ -66,6 +71,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @echo -n "Creating $(CONFIG_HS) ... "
        @echo "module Config where" >>$(CONFIG_HS)
        @echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
+       @echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
        @echo done.
 
 CLEAN_FILES += $(CONFIG_HS)
@@ -73,11 +79,13 @@ CLEAN_FILES += $(CONFIG_HS)
 # don't recurse on 'make install'
 #
 ifeq "$(INSTALLING)" "1"
-all clean veryclean maintainer-clean ::
+all clean distclean maintainer-clean ::
        $(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
 endif
 
 # hsc2hs-inplace is needed to boot in ghc/lib/std...
+ifneq "$(BootingFromHc)" "YES"
 boot :: all
+endif
 
 include $(TOP)/mk/target.mk