X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=faf6cf31c2760789fcf8d9cc03829d14ee22f0d1;hb=74a395c2cd036a82a17b3a6f3d33477ebadb66c2;hp=9dcc7d03798758be883c9832285675fa15182eb7;hpb=c9ed624be9c92be63178bded7ebabffd8136e9a6;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 9dcc7d0..faf6cf3 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.161 2001/06/22 13:31:29 rrt Exp $
+# $Id: Makefile,v 1.191 2001/08/17 22:29:06 sof Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -46,7 +46,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
 	@echo "cGhcUnregisterised    = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
 	@echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
-	@echo "cRAWCPP               = \"$(GHC_RAWCPP)\"" >> $(CONFIG_HS)
+	@echo "cRAWCPP_FLAGS         = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS)
 	@echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
 	@echo "cMKDLL                = \"$(BLD_DLL)\"" >> $(CONFIG_HS)
 	@echo "cGHC_DRIVER_DIR       = \"$(GHC_DRIVER_DIR)\"" >> $(CONFIG_HS)
@@ -62,6 +62,10 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@echo "cGHC_SYSMAN_DIR       = \"$(GHC_SYSMAN_DIR)\"" >> $(CONFIG_HS)
 	@echo "cGHC_CP               = \"$(GHC_CP)\"" >> $(CONFIG_HS)
 	@echo "cGHC_PERL             = \"$(GHC_PERL)\"" >> $(CONFIG_HS)
+ifeq ($(GhcWithIlx),YES)
+	@echo "cILX2IL               = \"$(ILX2IL)\"" >> $(CONFIG_HS)
+	@echo "cILASM                = \"$(ILASM)\"" >> $(CONFIG_HS)
+endif
 	@echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS)
 	@echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS)
 	@echo "cHaveLibGmp           = \"$(HaveLibGmp)\"" >> $(CONFIG_HS)
@@ -95,39 +99,64 @@ DIRS += ilxGen
 SRC_HC_OPTS += -DILX
 endif
 
+#
+# Canonicalize the GHC version number - assume it is has the form x.yy.[z] or 
+# x.yy[.date] where date = yyyymmdd
+#
+# [First sed substitution gets rid of the '.', second gets rid of the date portion,
+#  third appends a '0' if the z portion is missing]
+#
+CANON_HC_VERSION=$(shell echo "$(GhcVersion)" | sed -e 's/\.//g;s/^\(...\)........$$/\1/g;s/^\(...\)$$/\10/g')
+
+# 20010625
+
 ifeq "$(BootingFromHc)" "YES"
 # HC files are always from a self-booted compiler
-ghc_411_at_least = 1
+bootstrapped = YES
+compiling_with_4xx=NO
 else
-ghc_411_at_least = $(shell expr "$(GhcVersion)" \>= 4.11)
+bootstrapped = $(shell if (test $(CANON_HC_VERSION) -ge $(ProjectVersionInt)0); then echo YES; else echo NO; fi)
+compiling_with_4xx = $(shell if (test $(CANON_HC_VERSION) -lt 5000); then echo YES; else echo NO; fi)
+ghc_502_at_least = $(shell if (test $(CANON_HC_VERSION) -ge 5020); then echo YES; else echo NO; fi)
 endif
 
 # Only include GHCi if we're bootstrapping with at least version 411
 ifeq "$(GhcWithInterpreter)" "YES"
-ifeq "$(ghc_411_at_least)" "1"
+ifeq "$(bootstrapped)" "YES"
 SRC_HC_OPTS += -DGHCI
 DIRS += ghci
 endif
 endif
 
+HS_SRCS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
+HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs $(CONFIG_HS), $(HS_SRCS))
+HS_SRCS += $(CONFIG_HS)
+
 # Enable code that assumes a MSDOSish subshell. See mk/config.mk.in
 # for explanatory comment as to what this does.
-ifeq "$(MinimalUnixDeps)" "YES"
-SRC_HC_OPTS += -DMINIMAL_UNIX_DEPS
-ghc_501_at_least = $(shell expr "$(GhcVersion)" \> 5.00)
-ifneq "$(ghc_501_at_least)" "1"
-boot ::
-	$(CP) ../lib/std/cbits/system.c main
-C_SRCS += main/system.c
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ghc_501_at_least = $(shell if (test $(CANON_HC_VERSION) -ge 5010); then echo YES; else echo NO; fi)
+
+# -----------------------------------------------
+# GHCi calls the C procedure 'rawSystem'; but alas GHC 4.08 
+# does not have this.  Everything is fine if you are compiling
+# GHC with GHC 5.02 or better, but lacking that we have the following
+# hack: 
+#	copy rawSystem.c from hslibs/lang/cbits
+#	into main/ (where it'll be compiled and linked with the compiler)
+#       (the Haskell-side code is ifdefed into main/SysTools.lhs)
+
+ifneq "$(ghc_502_at_least)" "YES"
+C_SRCS += main/rawSystem.c
 SRC_CC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
 SRC_MKDEPENDC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
-HS_OBJS += main/system.o
+HS_OBJS += main/rawSystem.o
+main/rawSystem.c : $(FPTOOLS_TOP)/hslibs/lang/cbits/rawSystem.c
+	$(CP) $< main
 endif
 endif
-
-HS_SRCS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
-HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs $(CONFIG_HS), $(HS_SRCS))
-HS_SRCS += $(CONFIG_HS)
+#		End of system hack
+# -----------------------------------------------
 
 ifneq "$(BootingFromHc)" "YES"
 HS_SRCS += rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs
@@ -139,26 +168,22 @@ ifeq "$(BootingFromHc)" "YES"
 HCS	+= rename/ParseIface.hc parser/Parser.hc main/ParsePkgConf.hc
 endif
 
-HS_OBJS = \
-  $(patsubst %.hc, %.o, $(HCS)) \
-  parser/hschooks.o
-
-ifneq "$(ghc_501_at_least)" "1"
-HS_OBJS += main/system.o
-endif
-
-DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
-
 #
 # Add misc .c helper code (used by the frontend.)
 #
 C_SRCS += parser/hschooks.c
 
+HS_OBJS = \
+  $(patsubst %.hc, %.o, $(HCS)) \
+  $(patsubst %.c, %.o, $(C_SRCS))
+
+DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
+
 #
 # Big Fudge to get around inherent problem that Makefile setup
 # has got with 'mkdependC'.
 # 
-SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDES)
+SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR)
 
 # -----------------------------------------------------------------------------
 # 		Haskell compilations
@@ -189,14 +214,20 @@ SRC_HC_OPTS += \
   -I. -IcodeGen -InativeGen -Iparser \
   -i$(subst $(space),:,$(DIRS)) 
 
-# We should do this, to avoid the use of an explicit path
-# 	in GHC source files (include "../includes/config.h"
+# Omitted: 	-I$(GHC_INCLUDE_DIR)
+# We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, 
+# to avoid the use of an explicit path in GHC source files
+#	(include "../includes/config.h"
 # But alas GHC 4.08 (and others for all I know) uses this very
 # same include path when compiling the .hc files it generates.
 # Disaster!  Then the hc file sees the GHC 5.02 (or whatever)
 # include files.   For the moment we've reverted to using
 # an explicit path in the .hs sources
-#  -I$(GHC_INCLUDE_DIR) \
+#
+# For the benefit of <5.00 compilers, do include GHC_INCLUDE_DIR
+# when generating dependencies. (=> it gets passed onto mkdependHS,
+# which needs it).
+SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
 ifneq "$(mingw32_TARGET_OS)" "1"
 SRC_HC_OPTS += -package concurrent -package posix -package text -package util
@@ -206,7 +237,7 @@ endif
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
 SRC_HC_OPTS += -recomp $(GhcHcOpts)
-SRC_HC_OPTS += -H16m
+SRC_HC_OPTS += -H16M
 
 # 	Special flags for particular modules
 #	The standard suffix rule for compiling a Haskell file
@@ -226,7 +257,7 @@ main/ParsePkgConf_HC_OPTS	+= -fno-warn-incomplete-patterns
 
 # The latest GHC version doesn't have a -K option yet, and it doesn't
 # seem to be necessary anymore for the modules below.
-ifeq "$(ghc_411_at_least)" "0"
+ifeq "$(compiling_with_4xx)" "YES"
 rename/ParseIface_HC_OPTS 	+= -K2m
 parser/Parser_HC_OPTS 		+= -K2m
 endif
@@ -265,6 +296,13 @@ main/DriverUtil_HC_OPTS		= -fno-cse
 main/Finder_HC_OPTS		= -fno-cse
 main/SysTools_HC_OPTS		= -fno-cse
 
+# The #include is vital for the via-C route, else the C
+# compiler doesn't realise that the stcall foreign imports are indeed
+# stdcall, and doesn't generate the Foo@8 name for them
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+main/SysTools_HC_OPTS		+= '-\#include <windows.h>'
+endif
+
 # ----------------------------------------------------------------------------
 #		C compilations
 
@@ -275,6 +313,8 @@ SRC_C_OPTS     += -O -I. -IcodeGen
 #		Generate supporting stuff for prelude/PrimOp.lhs 
 #		from prelude/primops.txt
 
+CLEAN_FILES += prelude/primops.txt
+
 GENPOC=$(TOP)/utils/genprimopcode/genprimopcode
 
 PRIMOP_BITS=primop-data-decl.hs-incl \
@@ -289,6 +329,9 @@ PRIMOP_BITS=primop-data-decl.hs-incl \
             primop-usage.hs-incl  \
             primop-primop-info.hs-incl
 
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
+SRC_CPP_OPTS += ${GhcCppOpts}
+
 ifneq "$(BootingFromHc)" "YES"
 prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS)
 endif
@@ -340,11 +383,11 @@ all :: ghc-inplace
 ghc-inplace : $(HS_PROG)
 	@$(RM) $@
 	echo '#!/bin/sh' >>$@
-	echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS)/ghc/compiler '"$$@"' >>$@
+	echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
 	chmod 755 $@
-ifeq "$(TARGETPLATFORM) and $(MinimalUnixDeps)" "i386-unknown-mingw32 and YES"
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 	@$(RM) $@.bat
-	echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS)/ghc/compiler %*" >$@.bat
+	echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %1 %2 %3 %4 %5 %6 %7 %8 %9" >$@.bat
 	chmod 755 $@.bat
 endif