X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=72985607a0331f12283d8133740d8a0bf5d1db7b;hb=65691f95b3727c277a24ec5f0d5a4058c9a681e2;hp=3440b8496a5c1f58e6994d2e21d630c3906f8be2;hpb=d5aa9c5d7591744d112af1c921564dde16e292f5;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 3440b84..7298560 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -19,9 +19,7 @@ TOP = .. # Use GHC for compiling C bits (NB. must be before boilerplate include) # -ifneq "$(BootingFromHc)" "YES" UseGhcForCc = YES -endif include $(TOP)/mk/boilerplate.mk @@ -88,11 +86,28 @@ WAYS=$(GhcCompilerWays) # - create a link tree. The problem with requiring link trees is that # Windows doesn't support symbolic links. -boot :: +ifeq "$(stage)" "" +stage=1 +endif + +.DUMMY: stage_dir +stage_dirs : $(MKDIRHIER) stage$(stage) for i in $(ALL_DIRS); do \ $(MKDIRHIER) stage$(stage)/$$i; \ done + +ifeq "$(stage) $(ghc_ge_603)" "1 YES" +UsingHsBoot = YES +else +ifneq "$(findstring $(stage), 2 3)" "" +UsingHsBoot = YES +else +UsingHsBoot = NO +endif +endif + +boot :: stage_dirs # On Windows, we can't use symbolic links for the -hi-boot files # because GHC itself is a Mingw program and does not understand # symbolic links. So we have to copy the files instead of link them. @@ -102,18 +117,16 @@ boot :: # PS: 'ln -s foo baz' takes 'foo' relative to the path to 'baz' # whereas 'cp foo baz' treats the two paths independently. # Hence the "../.." in the ln command line +ifeq "$(UsingHsBoot)" "NO" ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" for i in */*hi-boot*; do \ cp -u -f $$i stage$(stage)/$$i; \ done else for i in */*hi-boot*; do \ - $(LN_S) -f ../../$$i stage$(stage)/$$i; \ + $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \ done endif - -ifeq "$(stage)" "" -stage=1 endif ifeq "$(stage)" "1" @@ -144,7 +157,14 @@ SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS)) HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))) C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS)))) -CLEAN_FILES += $(odir)/*/*.hi +# Our standard cleaning rules don't know that we're doing our output +# into $(odir), so we have to augment CLEAN_FILES appropriateliy. + +CLEAN_FILES += $(odir)/*/*.hi $(odir)/*/*.hi-boot $(odir)/*/*.o-boot + +ifeq "$(UsingHsBoot)" "YES" +CLEAN_FILES += $(odir)/*/*.hi-boot $(odir)/*/*.o-boot +endif ifeq "$(stage)" "1" mostlyclean clean distclean maintainer-clean :: @@ -182,7 +202,7 @@ boot :: $(CONFIG_HS) $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @$(RM) -f $(CONFIG_HS) - @echo -n "Creating $(CONFIG_HS) ... " + @echo "Creating $(CONFIG_HS) ... " @echo "module Config where" >>$(CONFIG_HS) @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) @@ -190,8 +210,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cProjectPatchLevel = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS) @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) - @echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS) - @echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) @@ -218,7 +236,6 @@ ifeq ($(GhcWithIlx),YES) endif @echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS) @echo "cCONTEXT_DIFF = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS) - @echo "cHaveLibGmp = \"$(HaveLibGmp)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) @@ -227,14 +244,122 @@ endif CLEAN_FILES += $(CONFIG_HS) # ----------------------------------------------------------------------------- +# Create platform includes + +# Here we generate a little header file containing CPP symbols that GHC +# uses to determine which platform it is building on/for. The platforms +# can differ between stage1 and stage2 if we're cross-compiling, so we +# need one of these header files per stage. + +PLATFORM_H = ghc_boot_platform.h + +stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile + @echo "Creating $@..." + @$(RM) $@ + @echo "#ifndef __PLATFORM_H__" >$@ + @echo "#define __PLATFORM_H__" >>$@ + @echo >> $@ + @echo "#define BuildPlatform_TYPE $(BuildPlatform_CPP)" >> $@ + @echo "#define HostPlatform_TYPE $(HostPlatform_CPP)" >> $@ + @echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@ + @echo >> $@ + @echo "#define $(BuildPlatform_CPP)_BUILD 1" >> $@ + @echo "#define $(HostPlatform_CPP)_HOST 1" >> $@ + @echo "#define $(TargetPlatform_CPP)_TARGET 1" >> $@ + @echo >> $@ + @echo "#define $(BuildArch_CPP)_BUILD_ARCH 1" >> $@ + @echo "#define $(HostArch_CPP)_HOST_ARCH 1" >> $@ + @echo "#define $(TargetArch_CPP)_TARGET_ARCH 1" >> $@ + @echo "#define BUILD_ARCH \"$(BuildArch_CPP)\"" >> $@ + @echo "#define HOST_ARCH \"$(HostArch_CPP)\"" >> $@ + @echo "#define TARGET_ARCH \"$(TargetArch_CPP)\"" >> $@ + @echo >> $@ + @echo "#define $(BuildOS_CPP)_BUILD_OS 1" >> $@ + @echo "#define $(HostOS_CPP)_HOST_OS 1" >> $@ + @echo "#define $(TargetOS_CPP)_TARGET_OS 1" >> $@ + @echo "#define BUILD_OS \"$(BuildOS_CPP)\"" >> $@ + @echo "#define HOST_OS \"$(HostOS_CPP)\"" >> $@ + @echo "#define TARGET_OS \"$(TargetOS_CPP)\"" >> $@ +ifeq "$(HostOS_CPP)" "irix" + @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS " >> $@ + @echo "#define $(IRIX_MAJOR)_TARGET_OS 1" >> $@ + @echo "#endif " >> $@ +endif + @echo >> $@ + @echo "#define $(BuildVendor_CPP)_BUILD_VENDOR 1" >> $@ + @echo "#define $(HostVendor_CPP)_HOST_VENDOR 1" >> $@ + @echo "#define $(TargetVendor_CPP)_TARGET_VENDOR 1" >> $@ + @echo "#define BUILD_VENDOR \"$(BuildVendor_CPP)\"" >> $@ + @echo "#define HOST_VENDOR \"$(HostVendor_CPP)\"" >> $@ + @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@ + @echo >> $@ + @echo "#endif /* __PLATFORM_H__ */" >> $@ + @echo "Done." + +# For stage2 and above, the BUILD platform is the HOST of stage1, and +# the HOST platform is the TARGET of stage1. The TARGET remains the same +# (stage1 is the cross-compiler, not stage2). +stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile + @echo "Creating $@..." + @$(RM) $@ + @echo "#ifndef __PLATFORM_H__" >$@ + @echo "#define __PLATFORM_H__" >>$@ + @echo >> $@ + @echo "#define BuildPlatform_TYPE $(HostPlatform_CPP)" >> $@ + @echo "#define HostPlatform_TYPE $(TargetPlatform_CPP)" >> $@ + @echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@ + @echo >> $@ + @echo "#define $(HostPlatform_CPP)_BUILD 1" >> $@ + @echo "#define $(TargetPlatform_CPP)_HOST 1" >> $@ + @echo "#define $(TargetPlatform_CPP)_TARGET 1" >> $@ + @echo >> $@ + @echo "#define $(HostArch_CPP)_BUILD_ARCH 1" >> $@ + @echo "#define $(TargetArch_CPP)_HOST_ARCH 1" >> $@ + @echo "#define $(TargetArch_CPP)_TARGET_ARCH 1" >> $@ + @echo "#define BUILD_ARCH \"$(HostArch_CPP)\"" >> $@ + @echo "#define HOST_ARCH \"$(TargetArch_CPP)\"" >> $@ + @echo "#define TARGET_ARCH \"$(TargetArch_CPP)\"" >> $@ + @echo >> $@ + @echo "#define $(HostOS_CPP)_BUILD_OS 1" >> $@ + @echo "#define $(TargetOS_CPP)_HOST_OS 1" >> $@ + @echo "#define $(TargetOS_CPP)_TARGET_OS 1" >> $@ + @echo "#define BUILD_OS \"$(HostOS_CPP)\"" >> $@ + @echo "#define HOST_OS \"$(TargetOS_CPP)\"" >> $@ + @echo "#define TARGET_OS \"$(TargetOS_CPP)\"" >> $@ +ifeq "$(HostOS_CPP)" "irix" + @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS " >> $@ + @echo "#define $(IRIX_MAJOR)_TARGET_OS 1" >> $@ + @echo "#endif " >> $@ +endif + @echo >> $@ + @echo "#define $(HostVendor_CPP)_BUILD_VENDOR 1" >> $@ + @echo "#define $(TargetVendor_CPP)_HOST_VENDOR 1" >> $@ + @echo "#define $(TargetVendor_CPP)_TARGET_VENDOR 1" >> $@ + @echo "#define BUILD_VENDOR \"$(HostVendor_CPP)\"" >> $@ + @echo "#define HOST_VENDOR \"$(TargetVendor_CPP)\"" >> $@ + @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@ + @echo >> $@ + @echo "#endif /* __PLATFORM_H__ */" >> $@ + @echo "Done." + +stage3/$(PLATFORM_H) : stage_dirs stage2/$(PLATFORM_H) + $(CP) stage2/$(PLATFORM_H) stage3/$(PLATFORM_H) + +STAGE_PLATFORM_H = stage$(stage)/$(PLATFORM_H) + +boot :: $(STAGE_PLATFORM_H) + +SRC_HC_OPTS += -Istage$(stage) + +# ----------------------------------------------------------------------------- # Set SRCS etc. # # First figure out ALL_DIRS, the source sub-directories ALL_DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ - specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \ - profiling parser cprAnalysis compMan ndpFlatten + specialise simplCore stranal stgSyn simplStg codeGen main \ + profiling parser cprAnalysis ndpFlatten iface cmm # Make sure we include Config.hs even if it doesn't exist yet... ALL_SRCS += $(CONFIG_HS) @@ -261,35 +386,69 @@ endif ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler bootstrapped = YES -compiling_with_4xx=NO else ifneq "$(findstring $(stage), 2 3)" "" bootstrapped = YES -compiling_with_4xx = NO else -bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi) -compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi) +bootstrapped = $(shell if (test $(GhcCanonVersion) -eq $(ProjectVersionInt) -a $(GhcPatchLevel) -eq $(ProjectPatchLevel)); then echo YES; else echo NO; fi) endif endif -# Only include GHCi if we're bootstrapping with at least version 411 +# ----------------------------------------------------------------------------- +# Building a compiler with interpreter support +# +# The interpreter, GHCi interface, and Template Haskell are only +# enabled when we are bootstrapping with the same version of GHC, and +# the interpreter is supported on this platform. + ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" + # Yes, include the interepreter, readline, and Template Haskell extensions -SRC_HC_OPTS += -DGHCI -package haskell-src +SRC_HC_OPTS += -DGHCI -package template-haskell +PKG_DEPENDS += template-haskell + +# Use threaded RTS with GHCi, so threads don't get blocked at the prompt. +SRC_HC_OPTS += -threaded + +ALL_DIRS += ghci + +# If we are going to use dynamic libraries instead of .o files for ghci, +# we will need to always retain CAFs in the compiler. +# ghci/keepCAFsForGHCi contains a GNU C __attribute__((constructor)) +# function which sets the keepCAFs flag for the RTS before any Haskell +# code is run. +ifeq "$(GhcBuildDylibs)" "YES" +else +EXCLUDED_SRCS += ghci/keepCAFsForGHCi.c +endif + +# Enable readline if either: +# - we're building stage 1 and $(GhcHasReadline)="YES" +# - we're building stage 2/3, and we have built the readline package +# +# But we don't enable readline on Windows, because readline is fairly +# broken there. +# ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -SRC_HC_OPTS += -package unix -ifeq "$(GhcLibsWithReadline)" "YES" -SRC_HC_OPTS += -package readline +ifeq "$(stage)" "1" +ifeq "$(GhcHasReadline)" "YES" +SRC_HC_OPTS += -package readline -DUSE_READLINE +PKG_DEPENDS += readline endif +else +ifeq "$(GhcLibsWithReadline)" "YES" +SRC_HC_OPTS += -package readline -DUSE_READLINE +PKG_DEPENDS += readline endif -ALL_DIRS += ghci +endif # stage=1 +endif # not windows + else + # No interpreter, so exclude Template Haskell modules EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs -endif -# There are some C files to include in HS_PROG, so add these to HS_OBJS -HS_OBJS += $(C_OBJS) +endif # bootstrapped with interpreter # ----------------------------------------------- # mkdependC stuff @@ -307,7 +466,7 @@ SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) # Haskell compilations SRC_HC_OPTS += \ - -cpp -fglasgow-exts -Rghc-timing \ + -cpp -fglasgow-exts -fno-generics -Rghc-timing \ -I. -IcodeGen -InativeGen -Iparser # Omitted: -I$(GHC_INCLUDE_DIR) @@ -325,14 +484,28 @@ SRC_HC_OPTS += \ # which needs it). SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) -# When bootstrapped, we don't make use of *any* packages -# (except possibly readline if GHCi is enabled, see above) -ifneq "$(bootstrapped)" "YES" -ifneq "$(mingw32_HOST_OS)" "1" -SRC_HC_OPTS += -package concurrent -package posix -package util +# We need System.Posix (or Posix when ghc < 6.2) +ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO" +SRC_HC_OPTS += -package posix else -SRC_HC_OPTS += -package concurrent -package util +SRC_HC_OPTS += -package unix +PKG_DEPENDS += unix +endif endif + +# We use the Cabal package in stages 2/3 only; in stage 1 we're using +# the libcompat library which provides the Cabal modules. +ifneq "$(stage)" "1" +SRC_HC_OPTS += -package Cabal +PKG_DEPENDS += Cabal +endif + +ifeq "$(ghc_ge_603)" "YES" +# Ignore lang, to avoid potential clash with the Generics module if +# lang happens to be a dependency of some exposed package in the local +# GHC installation (eg. wxHaskell did this around 6.4). +SRC_HC_OPTS += -ignore-package lang endif SRC_CC_OPTS += -Iparser -I. -O @@ -347,62 +520,68 @@ endif # The standard suffix rule for compiling a Haskell file # adds these flags to the command line -prelude/PrimOp_HC_OPTS = -no-recomp -H80m +# There used to be a -no-recomp flag on PrimOp, but why? +# It's an expensive module to recompile! +prelude/PrimOp_HC_OPTS = -H80m -# because the NCG can't handle the 64-bit math in here -prelude/PrelRules_HC_OPTS = -fvia-C main/ParsePkgConf_HC_OPTS += -fno-warn-incomplete-patterns +parser/Parser_HC_OPTS += -fno-warn-incomplete-patterns + +ifeq "$(ghc_ge_603)" "NO" # Use -fvia-C since the NCG can't handle the narrow16Int# (and intToInt16#?) # primops on all platforms. -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. -ifeq "$(compiling_with_4xx)" "YES" -parser/Parser_HC_OPTS += -K2m +parser/Parser_HC_OPTS += -fvia-C +# because the NCG can't handle the 64-bit math in here +prelude/PrelRules_HC_OPTS += -fvia-C +# ByteCodeItbls uses primops that the NCG doesn't support. +ghci/ByteCodeItbls_HC_OPTS += -fvia-C +ghci/ByteCodeLink_HC_OPTS += -fvia-C -monly-3-regs endif +# Careful optimisation of the parser: we don't want to throw everything +# at it, because that takes too long and doesn't buy much, but we do want +# to inline certain key external functions, so we instruct GHC not to +# throw away inlinings as it would normally do in -Onot mode: +parser/Parser_HC_OPTS += -Onot -fno-ignore-interface-pragmas + ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9" rename/RnMonad_HC_OPTS = -O2 -O2-for-C endif -utils/StringBuffer_HC_OPTS = -fvia-C -fno-prune-tydecls utils/Digraph_HC_OPTS = -fglasgow-exts +basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields + ifeq "$(bootstrapped)" "YES" utils/Binary_HC_OPTS = -funbox-strict-fields endif -# 4.08.2's NCG can't cope with Binary -ifeq "$(compiling_with_4xx)" "YES" -utils/Binary_HC_OPTS += -fvia-C -endif - -# ByteCodeItbls uses primops that the NCG doesn't support yet. -ghci/ByteCodeItbls_HC_OPTS += -fvia-C -ghci/ByteCodeLink_HC_OPTS += -fvia-C -monly-3-regs - -# BinIface and Binary take ages to both compile and run if you don's use -O +# We always optimise some low-level modules, otherwise performance of +# a non-optimised compiler is severely affected. main/BinIface_HC_OPTS += -O utils/Binary_HC_OPTS += -O utils/FastMutInt_HC_OPTS += -O +utils/Encoding_HC_OPTS += -O +utils/StringBuffer_HC_OPTS += -O +utils/FastString_HC_OPTS += -O +# ---- Profiling ---- +#simplCore/Simplify_HC_OPTS = -auto-all +#simplCore/SimplEnv_HC_OPTS = -auto-all +#simplCore/SimplUtils_HC_OPTS = -auto-all # 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 # this in 5.00+, but earlier versions of the compiler will need CSE turned off. # To be on the safe side, we disable CSE in *all* modules with top-level IORefs. -compMan/CompManager_HC_OPTS = -fno-cse ghci/InteractiveUI_HC_OPTS = -fno-cse main/CmdLineOpts_HC_OPTS = -fno-cse -main/DriverFlags_HC_OPTS = -fno-cse main/DriverMkDepend_HC_OPTS = -fno-cse main/DriverPipeline_HC_OPTS = -fno-cse -main/DriverState_HC_OPTS = -fno-cse -main/DriverUtil_HC_OPTS = -fno-cse main/Finder_HC_OPTS = -fno-cse main/SysTools_HC_OPTS = -fno-cse +main/StaticFlags_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 @@ -411,8 +590,7 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" main/SysTools_HC_OPTS += '-\#include ' '-\#include ' endif -# Required due to use of Concurrent.myThreadId -utils/Panic_HC_OPTS += -fvia-C +parser/Lexer_HC_OPTS += -funbox-strict-fields # ghc_strlen percolates through so many modules that it is easier to get its # prototype via a global option instead of a myriad of per-file OPTIONS @@ -438,7 +616,7 @@ PRIMOP_BITS=primop-data-decl.hs-incl \ CLEAN_FILES += prelude/primops.txt CLEAN_FILES += $(PRIMOP_BITS) -SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional +SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) SRC_CPP_OPTS += ${GhcCppOpts} ifneq "$(BootingFromHc)" "YES" @@ -476,16 +654,17 @@ primop-usage.hs-incl: prelude/primops.txt $(GENPOC) --usage < $< > $@ - -# ---------------------------------------------------------------------------- -# Parsers/lexers - -SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS $(GHC_HAPPY_OPTS) - #----------------------------------------------------------------------------- # Linking -SRC_LD_OPTS += -no-link-chk +# Include libghccompat in stage1 only. In stage2 onwards, all these +# libraries will be available from the main libraries. + +ifeq "$(stage)" "1" +include $(GHC_LIB_COMPAT_DIR)/compat.mk +endif + +SRC_LD_OPTS += -no-link-chk # ----------------------------------------------------------------------------- # create ghc-inplace, a convenient way to run ghc from the build tree... @@ -521,16 +700,82 @@ endif # ---------------------------------------------------------------------------- # profiling. -# rename/Rename_HC_OPTS += -auto-all -# rename/RnEnv_HC_OPTS += -auto-all -# rename/RnHiFiles_HC_OPTS += -auto-all -# rename/RnIfaces_HC_OPTS += -auto-all -# rename/RnSource_HC_OPTS += -auto-all # rename/RnBinds_HC_OPTS += -auto-all +# rename/RnEnv_HC_OPTS += -auto-all # rename/RnExpr_HC_OPTS += -auto-all +# rename/RnHiFiles_HC_OPTS += -auto-all # rename/RnHsSyn_HC_OPTS += -auto-all +# rename/Rename_HC_OPTS += -auto-all +# rename/RnIfaces_HC_OPTS += -auto-all # rename/RnNames_HC_OPTS += -auto-all +# rename/RnSource_HC_OPTS += -auto-all # rename/RnTypes_HC_OPTS += -auto-all +# +# typecheck/Inst_HC_OPTS += -auto-all +# typecheck/TcBinds_HC_OPTS += -auto-all +# typecheck/TcClassDcl_HC_OPTS += -auto-all +# typecheck/TcDefaults_HC_OPTS += -auto-all +# typecheck/TcDeriv_HC_OPTS += -auto-all +# typecheck/TcEnv_HC_OPTS += -auto-all +# typecheck/TcExpr_HC_OPTS += -auto-all +# typecheck/TcForeign_HC_OPTS += -auto-all +# typecheck/TcGenDeriv_HC_OPTS += -auto-all +# typecheck/TcHsSyn_HC_OPTS += -auto-all +# typecheck/TcIfaceSig_HC_OPTS += -auto-all +# typecheck/TcInstDcls_HC_OPTS += -auto-all +# typecheck/TcMatches_HC_OPTS += -auto-all +# typecheck/TcMonoType_HC_OPTS += -auto-all +# typecheck/TcMType_HC_OPTS += -auto-all +# typecheck/TcPat_HC_OPTS += -auto-all +# typecheck/TcRnDriver_HC_OPTS += -auto-all +# #typecheck/TcRnMonad_HC_OPTS += -auto-all +# #typecheck/TcRnTypes_HC_OPTS += -auto-all +# typecheck/TcRules_HC_OPTS += -auto-all +# typecheck/TcSimplify_HC_OPTS += -auto-all +# typecheck/TcSplice_HC_OPTS += -auto-all +# typecheck/TcTyClsDecls_HC_OPTS += -auto-all +# typecheck/TcTyDecls_HC_OPTS += -auto-all +# typecheck/TcType_HC_OPTS += -auto-all +# typecheck/TcUnify_HC_OPTS += -auto-all + +coreSyn/CorePrep_HC_OPTS += -auto-all +# parser/Parser_HC_OPTS += -fasm + +#----------------------------------------------------------------------------- +# Building the GHC package + +# The GHC package is made from the stage 2 build. Fortunately the +# package build system framework more or less does the right thing for +# us here. + +ifeq "$(stage)" "2" +PACKAGE = ghc +HIERARCHICAL_LIB = NO +VERSION = $(ProjectVersion) +PKG_DEPENDS += base haskell98 +PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)' + +# Omit Main from the library, the client will want to plug their own Main in +LIBOBJS = $(filter-out $(odir)/main/Main.o $(odir)/parser/hschooks.o, $(OBJS)) + +# disable splitting: it won't really help with GHC, and the specialised +# build system for ghc/compiler isn't set up to handle it. +SplitObjs = NO + +# the package build system likes to set WAYS=$(GhcLibWays), but we don't +# really want to build the whole of GHC multiple ways... if you do, +# set GhcCompilerWays instead. +GhcLibWays = $(GhcCompilerWays) + +# override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence +GhcLibHcOpts = + +# override default definition of HS_IFACES so we can add $(odir) +HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS))) + +# Haddock can't handle recursive modules currently, so we disable it for now. +NO_HADDOCK_DOCS = YES +endif #----------------------------------------------------------------------------- # clean @@ -544,6 +789,20 @@ MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info MKDEPENDHS_SRCS = MKDEPENDC_SRCS = +# Make doesn't work this out for itself, it seems +parser/Parser.y : parser/Parser.y.pp +EXTRA_SRCS += parser/Parser.y + + +#----------------------------------------------------------------------------- +# Source files for tags file generation +# +# We want to excluded derived sources, because they won't be in the source +# tree, which is where we are going to move the TAGS file to.a + +TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS))) + + include $(TOP)/mk/target.mk # ----------------------------------------------------------------------------- @@ -554,10 +813,17 @@ MKDEPENDHS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS)) MKDEPENDHS=$(HC) # Must do this *after* including target.mk, because $(HS_SRCS) isn't set yet. -depend :: $(HS_SRCS) $(C_SRCS) +depend :: $(STAGE_PLATFORM_H) $(HS_SRCS) $(C_SRCS) + touch .depend-BASE +ifneq "$(BootingFromHc)" "YES" $(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS) +endif $(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS) - $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g' <.depend-BASE >.depend-$(stage) + $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g; s@^.*/lib/compat.*$$@@g;' <.depend-BASE >.depend-$(stage) # The binmode stuff tells perl not to add stupid ^M's to the output +# +# The /lib/compat replacement is to workaround a bug in the +# -optdep--exclude-module flag in GHC 6.4. It is not required for any +# other version of GHC, but doesn't do any harm. -include .depend-$(stage)