X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=bb79137406da004eb6ca35882f357a03548a2512;hb=17861c1bff145a4c17c2f80e18110fcd6658a54f;hp=f0ab704aba5fe6e2f8fd48701532c1009e963a66;hpb=4271e3a2d9a1fbe24ea1fb6c3f2287968ad08d52;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index f0ab704..bb79137 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.188 2001/08/15 18:31:57 qrczak Exp $ +# $Id: Makefile,v 1.204 2002/01/17 09:15:16 sof Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -14,12 +14,16 @@ WAYS=$(GhcCompilerWays) # Note: there have been reports of people running up against the ARG_MAX limit # when linking ghc with all its constituent object files. The likely source of # the problem is that the environment is a bit too big, so a workaround could -# be to do ` env PATH=$(PATH) make ghc 'to minimise the environment. (or the +# be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the # equivalent of `env' if it doesn't exist locally). # ifneq "$(way)" "dll" +ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" HS_PROG=ghc$(_way)-$(ProjectVersion) else +HS_PROG=ghc$(_way) +endif +else HS_PROG=ghc-$(ProjectVersion) endif @@ -86,7 +90,7 @@ CLEAN_FILES += $(CONFIG_HS) DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \ - profiling parser usageSP cprAnalysis javaGen compMan + profiling parser usageSP cprAnalysis compMan ifeq ($(GhcWithNativeCodeGen),YES) DIRS += nativeGen @@ -99,25 +103,19 @@ 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 ($(GhcWithJavaGen),YES) +DIRS += javaGen +SRC_HC_OPTS += -DJAVA +endif ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler bootstrapped = YES compiling_with_4xx=NO else -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) +bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt)); then echo YES; else echo NO; fi) +compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi) +ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi) endif # Only include GHCi if we're bootstrapping with at least version 411 @@ -135,7 +133,7 @@ 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 "$(TARGETPLATFORM)" "i386-unknown-mingw32" -ghc_501_at_least = $(shell if (test $(CANON_HC_VERSION) -ge 5010); then echo YES; else echo NO; fi) +ghc_501_at_least = $(shell if (test $(GhcVanonVersion) -ge 5010); then echo YES; else echo NO; fi) # ----------------------------------------------- # GHCi calls the C procedure 'rawSystem'; but alas GHC 4.08 @@ -223,6 +221,11 @@ SRC_HC_OPTS += \ # 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 +# +# 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 @@ -246,9 +249,11 @@ prelude/PrimOp_HC_OPTS = -no-recomp -H80m # because the NCG can't handle the 64-bit math in here prelude/PrelRules_HC_OPTS = -fvia-C -rename/ParseIface_HC_OPTS += -Onot -H45m -fno-warn-incomplete-patterns -parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns main/ParsePkgConf_HC_OPTS += -fno-warn-incomplete-patterns +# Use -fvia-C since the NCG can't handle the narrow16Int# (and intToInt16#?) +# primops on all platforms. +rename/ParseIface_HC_OPTS += -Onot -H45m -fno-warn-incomplete-patterns -fvia-C +parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns -fvia-C # The latest GHC version doesn't have a -K option yet, and it doesn't # seem to be necessary anymore for the modules below. @@ -274,7 +279,7 @@ utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs # ByteCodeItbls uses primops that the NCG doesn't support yet. ghci/ByteCodeItbls_HC_OPTS = -fvia-C -ghci/ByteCodeLink_HC_OPTS = -fvia-C +ghci/ByteCodeLink_HC_OPTS = -fvia-C -monly-3-regs # CSE interacts badly with top-level IORefs (reportedly in DriverState and # DriverMkDepend), causing some of them to be commoned up. We have a fix for @@ -295,7 +300,7 @@ main/SysTools_HC_OPTS = -fno-cse # 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 ' +main/SysTools_HC_OPTS += '-\#include ' '-\#include ' endif # ---------------------------------------------------------------------------- @@ -324,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 @@ -375,13 +383,8 @@ 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) '"$$@"' >>$@ + echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@ chmod 755 $@ -ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" - @$(RM) $@.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 CLEAN_FILES += ghc-inplace @@ -390,9 +393,13 @@ CLEAN_FILES += ghc-inplace # We don't want ghc treated as an ordinary executable, # but put it together with the libraries. -# Also don't want any interface files intstalled +# Also don't want any interface files installed +ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" INSTALL_LIBEXECS += $(HS_PROG) +else +INSTALL_PROGS += $(HS_PROG) +endif #----------------------------------------------------------------------------- # clean