X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=0095419c4bcb44c59fad19ca2e5431a04b49a89d;hb=a1706e166ef400bab3b15a8fd80145ede6655c62;hp=a7d8452e48d7b4cf47c712abac872c9cc22a4194;hpb=1f9d5a8835940fa332f2b1b51ff59e0239b5fc3a;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index a7d8452..0095419 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,56 +216,98 @@ 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 + @echo "cLibFFI :: Bool" >> $(CONFIG_HS) ifeq "$(UseLibFFI)" "YES" @echo "cLibFFI = True" >> $(CONFIG_HS) else @@ -418,6 +457,11 @@ ALL_DIRS += javaGen SRC_HC_OPTS += -DJAVA endif +ifeq ($(UseLibFFI),YES) +SRC_HC_OPTS += -DUSE_LIBFFI +SRC_HSC2HS_OPTS += -DUSE_LIBFFI +endif + ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler bootstrapped = YES @@ -597,7 +641,7 @@ endif utils/Digraph_HC_OPTS = -fglasgow-exts -basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields +# basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields # We always optimise some low-level modules, otherwise performance of # a non-optimised compiler is severely affected. @@ -938,7 +982,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))