X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=4db30aa9319ae73026f29592ceb6e6d8cc0f1384;hb=5e5cecc9096826a276d4fa56b280fd216579b7f6;hp=2a014b9f2ed623ed651211c2c98476c44ac885ad;hpb=4cfe37a21c58a8676642bfe5a813839fc33a0167;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 2a014b9..4db30aa 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -124,7 +124,8 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" done else for i in */*hi-boot*; do \ - $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \ + ($(RM) -f stage$(stage)/$$i \ + && $(LN_S) ../../$$i stage$(stage)/$$i) || true ; \ done endif endif @@ -191,7 +192,7 @@ else GHC_PROG=$(odir)/ghc-$(ProjectVersion) endif -ifneq "$(stage)" "2" +ifeq "$(stage)" "1" HS_PROG = $(GHC_PROG) endif @@ -213,9 +214,11 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS) @echo "cProjectPatchLevel = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS) @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) + @echo "cStage = STAGE" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) + @echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) @echo "cRAWCPP_FLAGS = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS) @echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS) @@ -410,11 +413,19 @@ endif ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" # Yes, include the interepreter, readline, and Template Haskell extensions -SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell +SRC_HC_OPTS += -DGHCI -package template-haskell PKG_DEPENDS += template-haskell +# Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style +# or not? +ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" +SRC_HC_OPTS += -DGHCI_TABLES_NEXT_TO_CODE +endif + +ifneq "$(GhcNotThreaded)" "YES" # Use threaded RTS with GHCi, so threads don't get blocked at the prompt. SRC_HC_OPTS += -threaded +endif ALL_DIRS += ghci @@ -476,7 +487,7 @@ SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) SRC_HC_OPTS += \ -cpp -fglasgow-exts -fno-generics -Rghc-timing \ - -I. -IcodeGen -InativeGen -Iparser + -I. -Iparser # Omitted: -I$(GHC_INCLUDE_DIR) # We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, @@ -515,16 +526,6 @@ SRC_HC_OPTS += -package Cabal PKG_DEPENDS += Cabal endif -# We use Text.Regex which is in regex-compat with GHC 6.6+ -ifeq "$(bootstrapped)" "YES" -SRC_HC_OPTS += -package regex-compat -PKG_DEPENDS += regex-compat -else -ifeq "$(ghc_ge_605)" "YES" -SRC_HC_OPTS += -package regex-compat -endif -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 @@ -701,14 +702,69 @@ SRC_LD_OPTS += -no-link-chk all :: $(odir)/ghc-inplace ghc-inplace +# MSys notes +# Note 1 +# I'm exec'ing $(SCRIPT_SHELL), rather than the usual #!/bin/sh, to make +# sure that the right shell is invoked. If we use /bin/sh, then +# when ghc-inplace is invoked from a Cygwin Python (which is the only Python +# that seems to run the test-suite correctly), we get the Cygwin shell, +# and it in turn interprets the path-names in the second (exec) line +# differently to the MSys shell. That's bad, because ghc-inplace must +# also work when invoked from MSys shells +# +# To figure out what the MSys shell is, we cd to '/bin' and do 'pwd -W' +# On MSys, the -W flag prints out the directory in c:/msys/bin format +# (On other system, -W isn't a pwd flag at all.) + +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +all :: $(odir)/ghc-inplace.bat ghc-inplace.bat +CLEAN_FILES += $(odir)/ghc-inplace.bat ghc-inplace.bat +endif + +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +# MSys (...and cygwin with a mingw toolchain) +SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh +else +# Cygwin and Unix +SCRIPT_SHELL = /bin/sh +endif + +# MSys Note 2 +# On MSys, we must use the following script for ghc-inplace: +# exec /c/darcs/fc-branch-2/compiler/stage1/ghc -Bc:/darcs/fc-branch-2 "$@" +# That is, +# (a) You *must* use the /c/ form for the first arg to exec. Using the +# c:/ form makes exec complain that it can't find $pwd/c:/darcs/.../ghc +# The /c/ form is $(FPTOOLS_TOP_ABS) +# (b) You *must* use the c:/ form for the -B argument, else the testsuite +# doesn't work. I think that's something to do with ghc-inplace being +# invoked by Python +# The c:/ form is $(FPTOOLS_TOP_ABS_PLATFORM) + $(odir)/ghc-inplace : $(GHC_PROG) @$(RM) $@ - echo '#!/bin/sh' >>$@ - echo exec $(GHC_COMPILER_DIR_ABS)/$(GHC_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@ + echo '#!$(SCRIPT_SHELL)' >>$@ +# Re SCRIPT_SHELL, see note 1 above + echo exec $(GHC_COMPILER_DIR_ABS)/$(GHC_PROG) \ + '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@ +# Re exec, see note 2 above chmod 755 $@ +# MSys Note 3 +# When we generate a .bat file, we must also use the form +# @call c:\darcs\fc-branch-2\compiler\stage1\ghc-inplace +# else the cmd shell gets confused; indeed it seems to simply hang +# Hence the use of $(FPTOOLS_TOP_ABS_PLATFORM) here, just like MSys Note 2 + +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +ghc-inplace.bat $(odir)/ghc-inplace.bat: $(GHC_PROG) + @$(RM) $@ + echo '@call $(subst /,\,$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)) -B$(FPTOOLS_TOP_ABS_PLATFORM) %*' >> $@ + chmod 755 $@ +endif + ghc-inplace : stage1/ghc-inplace - $(LN_S) -f $< $@ + $(RM) -f $@ && $(LN_S) $< $@ ifeq "$(stage)" "1" CLEAN_FILES += ghc-inplace @@ -778,16 +834,17 @@ coreSyn/CorePrep_HC_OPTS += -auto-all #----------------------------------------------------------------------------- # 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. +# The GHC package is made from the stage 2 build and later. +# Fortunately the package build system framework more or less does the +# right thing for us here. -ifeq "$(stage)" "2" +ifneq "$(findstring $(stage), 2 3)" "" PACKAGE = ghc HIERARCHICAL_LIB = NO VERSION = $(ProjectVersion) PKG_DEPENDS += base haskell98 PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)' +PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"' # 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)) @@ -810,20 +867,76 @@ 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 -# Don't build the GHC binary as normal, because we need to link it -# against the GHC package. The GHC binary itself is built by -# compiling Main.o separately and linking it with -package ghc. This is -# done using a separate Makefile: +# Tell package.mk not to set $(HC) +NO_SET_HC = YES + +# The stage 2 GHC binary itself is built by compiling main/Main.hs +# (the same as used in stage 1) against the GHC package. +# +# This is done by compiling Main.hs separately and linking it with +# -package ghc. This is done using a separate Makefile, Makefile.ghcbin +# Why? See comments in Makefile.ghcbin all :: $(GHC_PROG) -$(GHC_PROG) : libHS$(PACKAGE)$(_way).a main/Main.hs +# The stage 2 and stage 3 package.conf.in files are different, because they +# point to either the stage2/ or stage3/ dirs in import-dirs. Hence before +# linking the ghc binary we must install the correct version of the package +# configuration. Yeuch... maybe one day this will all be done more cleanly. +STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE) + +ifeq "$(GhcBuildDylibs)" "YES" +ifeq "$(darwin_TARGET_OS)" "1" +GhcLibraryName=libHS$(PACKAGE)$(_way)_dyn.dylib +else +GhcLibraryName=libHS$(PACKAGE)$(_way)_dyn.so +endif +else +GhcLibraryName=libHS$(PACKAGE)$(_way).a +endif + +ifneq "$(DOING_BIN_DIST)" "YES" +$(GHC_PROG) : $(GhcLibraryName) main/Main.hs + $(RM) package.conf.inplace + $(RM) $(STAMP_PKG_CONF) + $(MAKE) $(STAMP_PKG_CONF) $(MAKE) -f Makefile.ghcbin $(MFLAGS) HS_PROG=$(GHC_PROG) $@ +endif +# Propagate standard targets to Makefile.ghcbin docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $(INSTALL_TARGET) $(INSTALL_DOCS_TARGET) html chm HxS ps dvi txt:: $(MAKE) -f Makefile.ghcbin $(MFLAGS) $@ endif +include $(TOP)/mk/package.mk + +#----------------------------------------------------------------------------- +# binary-dist + +ifeq "$(DOING_BIN_DIST)" "YES" +# This is derived from the sources when we are in a source tree, but we +# don't have any sources in a bindist, so we have to shortcut it +HS_IFACES := $(wildcard stage$(stage)/*/*.hi) +endif + +binary-dist: + $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler + $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage) + echo "stage=$(stage)" > $(BIN_DIST_DIR)/compiler/Makefile + cat Makefile >> $(BIN_DIST_DIR)/compiler/Makefile + $(INSTALL_DATA) package.conf.in $(BIN_DIST_DIR)/compiler/ + set -e; for d in stage$(stage)/*/; do $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/$$d; done + set -e; for f in $(HS_IFACES); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done +ifneq "$(INSTALL_LIBS)" "" + set -e; for f in $(INSTALL_LIBS); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done +endif +ifneq "$(INSTALL_PROGS)" "" + set -e; for f in $(INSTALL_PROGS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done +endif +ifneq "$(INSTALL_LIBEXECS)" "" + set -e; for f in $(INSTALL_LIBEXECS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done +endif + #----------------------------------------------------------------------------- # clean @@ -849,9 +962,57 @@ EXTRA_SRCS += parser/Parser.y TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS))) - include $(TOP)/mk/target.mk +$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"' + +# ----------------------------------------------------------------------------- +# Explicit dependencies + +# Some .hs files #include other source files, but since ghc -M doesn't spit out +# these dependencies we have to include them manually. + +# We don't add dependencies on HsVersions.h, ghcautoconf.h, or ghc_boot_platform.h, +# because then modifying one of these files would force recompilation of everything, +# which is probably not what you want. However, it does mean you have to be +# careful to recompile stuff you need if you reconfigure or change HsVersions.h. + +# Aargh, these don't work properly anyway, because GHC's recompilation checker +# just reports "compilation NOT required". Do we have to add -no-recomp for each +# of these .hs files? I haven't done anything about this yet. + +$(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h +$(odir)/codeGen/CgCallConv.$(way_)o : ../includes/StgFun.h +$(odir)/codeGen/CgProf.$(way_)o : ../includes/MachDeps.h +$(odir)/codeGen/CgProf.$(way_)o : ../includes/Constants.h +$(odir)/codeGen/CgProf.$(way_)o : ../includes/DerivedConstants.h +$(odir)/codeGen/CgTicky.$(way_)o : ../includes/DerivedConstants.h +$(odir)/codeGen/ClosureInfo.$(way_)o : ../includes/MachDeps.h +$(odir)/codeGen/SMRep.$(way_)o : ../includes/MachDeps.h +$(odir)/codeGen/SMRep.$(way_)o : ../includes/ClosureTypes.h +$(odir)/ghci/ByteCodeAsm.$(way_)o : ../includes/Bytecodes.h +$(odir)/ghci/ByteCodeFFI.$(way_)o : nativeGen/NCG.h +$(odir)/ghci/ByteCodeInstr.$(way_)o : ../includes/MachDeps.h +$(odir)/ghci/ByteCodeItbls.$(way_)o : ../includes/ClosureTypes.h +$(odir)/ghci/ByteCodeItbls.$(way_)o : nativeGen/NCG.h +$(odir)/main/Constants.$(way_)o : ../includes/MachRegs.h +$(odir)/main/Constants.$(way_)o : ../includes/Constants.h +$(odir)/main/Constants.$(way_)o : ../includes/MachDeps.h +$(odir)/main/Constants.$(way_)o : ../includes/DerivedConstants.h +$(odir)/main/Constants.$(way_)o : ../includes/GHCConstants.h +$(odir)/nativeGen/AsmCodeGen.$(way_)o : nativeGen/NCG.h +$(odir)/nativeGen/MachCodeGen.$(way_)o : nativeGen/NCG.h +$(odir)/nativeGen/MachCodeGen.$(way_)o : ../includes/MachDeps.h +$(odir)/nativeGen/MachInstrs.$(way_)o : nativeGen/NCG.h +$(odir)/nativeGen/MachRegs.$(way_)o : nativeGen/NCG.h +$(odir)/nativeGen/MachRegs.$(way_)o : ../includes/MachRegs.h +$(odir)/nativeGen/PositionIndependentCode.$(way_)o : nativeGen/NCG.h +$(odir)/nativeGen/PprMach.$(way_)o : nativeGen/NCG.h +$(odir)/nativeGen/RegAllocInfo.$(way_)o : nativeGen/NCG.h +$(odir)/typecheck/TcForeign.$(way_)o : nativeGen/NCG.h +$(odir)/utils/Binary.$(way_)o : ../includes/MachDeps.h +$(odir)/utils/FastMutInt.$(way_)o : ../includes/MachDeps.h + # ----------------------------------------------------------------------------- # Dependencies