X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=216e5f8a30376d0513bd9c480c40bbfd59f67320;hp=0d866f629e9f584f090eed0fa7b1791babb768f1;hb=e4417dcd4679da9c6b18c02ff667199c572bed89;hpb=c2adbe169694478db4c02fef6e5491622642803d diff --git a/compiler/Makefile b/compiler/Makefile index 0d866f6..216e5f8 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -95,9 +95,6 @@ ifeq "$(stage)" "" stage=1 endif -# XXX DQ is now the same on all platforms, so get rid of it -DQ = \" - .DUMMY: stage_dir stage_dirs : $(MKDIRHIER) stage$(stage) @@ -219,57 +216,99 @@ boot :: $(CONFIG_HS) $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk @$(RM) -f $(CONFIG_HS) @echo "Creating $(CONFIG_HS) ... " - @echo "{-# OPTIONS -w #-}" >>$(CONFIG_HS) @echo "module Config where" >>$(CONFIG_HS) + @echo "cProjectName :: String" >> $(CONFIG_HS) @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) + @echo "cProjectVersion :: String" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) + @echo "cProjectVersionInt :: String" >> $(CONFIG_HS) @echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS) + @echo "cProjectPatchLevel :: String" >> $(CONFIG_HS) @echo "cProjectPatchLevel = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS) + @echo "cBooterVersion :: String" >> $(CONFIG_HS) @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) + @echo "cStage :: String" >> $(CONFIG_HS) @echo "cStage = STAGE" >> $(CONFIG_HS) + @echo "cHscIfaceFileVersion :: String" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) + @echo "cSplitObjs :: String" >> $(CONFIG_HS) @echo "cSplitObjs = \"$(SplitObjs)\"" >> $(CONFIG_HS) + @echo "cGhcWithInterpreter :: String" >> $(CONFIG_HS) @echo "cGhcWithInterpreter = \"$(GhcWithInterpreter)\"" >> $(CONFIG_HS) + @echo "cGhcWithNativeCodeGen :: String" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) + @echo "cGhcWithSMP :: String" >> $(CONFIG_HS) @echo "cGhcWithSMP = \"$(GhcWithSMP)\"" >> $(CONFIG_HS) + @echo "cGhcRTSWays :: String" >> $(CONFIG_HS) @echo "cGhcRTSWays = \"$(GhcRTSWays)\"" >> $(CONFIG_HS) + @echo "cGhcUnregisterised :: String" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) + @echo "cGhcEnableTablesNextToCode :: String" >> $(CONFIG_HS) @echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS) + @echo "cLeadingUnderscore :: String" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) + @echo "cRAWCPP_FLAGS :: String" >> $(CONFIG_HS) @echo "cRAWCPP_FLAGS = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS) + @echo "cGCC :: String" >> $(CONFIG_HS) @echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS) + @echo "cMKDLL :: String" >> $(CONFIG_HS) @echo "cMKDLL = \"$(BLD_DLL)\"" >> $(CONFIG_HS) + @echo "cLdIsGNULd :: String" >> $(CONFIG_HS) @echo "cLdIsGNULd = \"$(LdIsGNULd)\"" >> $(CONFIG_HS) + @echo "cLD_X :: String" >> $(CONFIG_HS) @echo "cLD_X = \"$(LD_X)\"" >> $(CONFIG_HS) + @echo "cPROJECT_DIR :: String" >> $(CONFIG_HS) @echo "cPROJECT_DIR = \"$(PROJECT_DIR)\"" >> $(CONFIG_HS) + @echo "cGHC_DRIVER_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_DRIVER_DIR_REL = \"$(GHC_DRIVER_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_TOUCHY_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_TOUCHY_PGM = \"$(GHC_TOUCHY_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_TOUCHY_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_TOUCHY_DIR_REL = \"$(GHC_TOUCHY_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_UNLIT_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_UNLIT_PGM = \"$(GHC_UNLIT_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_UNLIT_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_UNLIT_DIR_REL = \"$(GHC_UNLIT_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_MANGLER_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_MANGLER_PGM = \"$(GHC_MANGLER_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_MANGLER_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_MANGLER_DIR_REL = \"$(GHC_MANGLER_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_SPLIT_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_SPLIT_PGM = \"$(GHC_SPLIT_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_SPLIT_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_SPLIT_DIR_REL = \"$(GHC_SPLIT_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_SYSMAN_PGM :: String" >> $(CONFIG_HS) @echo "cGHC_SYSMAN_PGM = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS) + @echo "cGHC_SYSMAN_DIR_REL :: String" >> $(CONFIG_HS) @echo "cGHC_SYSMAN_DIR_REL = \"$(GHC_SYSMAN_DIR)\"" >> $(CONFIG_HS) + @echo "cGHC_CP :: String" >> $(CONFIG_HS) @echo "cGHC_CP = \"$(GHC_CP)\"" >> $(CONFIG_HS) + @echo "cGHC_PERL :: String" >> $(CONFIG_HS) @echo "cGHC_PERL = \"$(GHC_PERL)\"" >> $(CONFIG_HS) ifeq ($(GhcWithIlx),YES) + @echo "cILX2IL :: String" >> $(CONFIG_HS) @echo "cILX2IL = \"$(ILX2IL)\"" >> $(CONFIG_HS) + @echo "cILASM :: String" >> $(CONFIG_HS) @echo "cILASM = \"$(ILASM)\"" >> $(CONFIG_HS) endif + @echo "cEnableWin32DLLs :: String" >> $(CONFIG_HS) @echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS) + @echo "cCONTEXT_DIFF :: String" >> $(CONFIG_HS) @echo "cCONTEXT_DIFF = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS) + @echo "cUSER_WAY_NAMES :: String" >> $(CONFIG_HS) @echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS) + @echo "cUSER_WAY_OPTS :: String" >> $(CONFIG_HS) @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) + @echo "cDEFAULT_TMPDIR :: String" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) + @echo "cRelocatableBuild :: Bool" >> $(CONFIG_HS) ifeq "$(RelocatableBuild)" "YES" @echo "cRelocatableBuild = True" >> $(CONFIG_HS) else @echo "cRelocatableBuild = False" >> $(CONFIG_HS) endif -ifeq "$(UseLibFFI)" "YES" + @echo "cLibFFI :: Bool" >> $(CONFIG_HS) +ifeq "$(UseLibFFIForAdjustors)" "YES" @echo "cLibFFI = True" >> $(CONFIG_HS) else @echo "cLibFFI = False" >> $(CONFIG_HS) @@ -394,7 +433,7 @@ SRC_HC_OPTS += -Istage$(stage) ALL_DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ vectorise specialise simplCore stranal stgSyn simplStg codeGen main \ - profiling parser cprAnalysis ndpFlatten iface cmm + profiling parser cprAnalysis iface cmm # Make sure we include Config.hs even if it doesn't exist yet... ALL_SRCS += $(CONFIG_HS) @@ -429,6 +468,15 @@ bootstrapped = NO endif endif +# Beyond stage 1, honour any Mac OS X depolyment target options. If we use +# these options in stage 1 we get a linker error if the bootstrap compiler is +# for a more recent OS version +ifneq "$(findstring $(stage), 2 3)" "" +SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS) +SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) +SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) +endif + # ----------------------------------------------------------------------------- # Building a compiler with interpreter support # @@ -464,6 +512,9 @@ ifeq "$(GhcDebugged)" "YES" SRC_LD_OPTS += -debug endif +SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libffi/build/include +SRC_HSC2HS_OPTS += -I$(FPTOOLS_TOP)/libffi/build/include + ALL_DIRS += ghci # If we are going to use dynamic libraries instead of .o files for ghci, @@ -476,23 +527,23 @@ 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 +# Enable editline if either: +# - we're building stage 1 and $(GhcHasEditline)="YES" +# - we're building stage 2/3, and we have built the editline package # -# But we don't enable readline on Windows, because readline is fairly -# broken there. +# But we don't enable editline on Windows, as Windows terminals have +# editline-like support builtin. # ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" ifeq "$(stage)" "1" -ifeq "$(GhcHasReadline)" "YES" -SRC_HC_OPTS += -package readline -DUSE_READLINE -PKG_DEPENDS += readline +ifeq "$(GhcHasEditline)" "YES" +SRC_HC_OPTS += -package editline -DUSE_EDITLINE +PKG_DEPENDS += editline endif else -ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/readline/unbuildable)" "" -SRC_HC_OPTS += -package readline -DUSE_READLINE -PKG_DEPENDS += readline +ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" "" +SRC_HC_OPTS += -package editline -DUSE_EDITLINE +PKG_DEPENDS += editline endif endif # stage=1 endif # not windows @@ -718,6 +769,13 @@ endif SRC_LD_OPTS += -no-link-chk +ifeq "$(GhcUnregisterised)" "NO" +ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux" +# needed for generating proper relocation in large binaries: trac #856 +SRC_LD_OPTS += -optl-Wl,--relax +endif +endif + # ----------------------------------------------------------------------------- # create ghc-inplace, a convenient way to run ghc from the build tree... # See comments in $(FPTOOLS_TOP)/utils/ghc-pkg/Makefile for why we use @@ -828,6 +886,8 @@ LIB_LD_OPTS += $(foreach pkg,$(PKG_DEPENDS),-package $(pkg)) # We have to expand each package dependency with its version, which we # can do by calling "ghc-pkg list $pkg --simple-output". PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(foreach pkg,$(PKG_DEPENDS),$(shell $(GHC_PKG_INPLACE) latest --global $(pkg)))' +# We want to define STAGE to be like "2" in the Haskell code, so we need +# to quote the "s so that they don't get interpreted by the shell. PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"' # Omit Main from the library, the client will want to plug their own Main in @@ -938,7 +998,7 @@ ifeq "$(BUILD_GHC_PACKAGE)" "YES" all :: $(GHC_PROG) endif -$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE=$(DQ)$(stage)$(DQ) +$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"' ifneq "$(findstring $(stage), 2 3)" "" $(warning LIBRARY is $(LIBRARY))