X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=be65b243e471a7543eea2592510700cee343be20;hb=53ec704b7155b18a49f09e6894fd033db3b8f592;hp=0e0a61301c5ab02b9c296baccfa32dc61bebd434;hpb=5b846fa36eee0f96c4c47128706d0131f8bb4113;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 0e0a613..be65b24 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -192,13 +192,18 @@ MACOSX_DEPLOYMENT_SDK = @MACOSX_DEPLOYMENT_SDK@ ifneq "$(MACOSX_DEPLOYMENT_VERSION)" "" MACOSX_DEPLOYMENT_CC_OPTS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_VERSION) \ - -isysroot $(MACOSX_DEPLOYMENT_SDK) + -isysroot $(MACOSX_DEPLOYMENT_SDK) \ + --no-builtin-fprintf MACOSX_DEPLOYMENT_LD_OPTS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_VERSION) \ -Wl,-syslibroot,$(MACOSX_DEPLOYMENT_SDK) # We don't extend SRC_CC_OPTS and friends here directly, as (a) they may get # overwritten in build.mk and (b) we must not use the deployment options in # stage 1 or we get a linker error if the bootstrap compiler is for a more # recent OS version. +# +# We need --no-builtin-fprintf, as the use of the builtin function optimisation +# for fprintf together with #include "PosixSource" in the RTS leads to the +# use of fwrite$UNIX2003 (with GCC 4.0.1 on Mac OS X 10.5.2). endif ################################################################################ @@ -231,8 +236,8 @@ GhcHcOpts=-Rghc-timing # These are placed later on the command line, and may therefore # override options from $(GhcHcOpts). GhcStage1HcOpts= -GhcStage2HcOpts= -GhcStage3HcOpts= +GhcStage2HcOpts=-O2 +GhcStage3HcOpts=-O2 GhcProfiled=NO GhcDebugged=NO @@ -349,6 +354,9 @@ MakefileDeps=YES #------------------------------------------------------------------------------ # Options for Libraries +# Which directory (in libraries/) contains the integer library? +INTEGER_LIBRARY=integer-gmp + # What extra ways to build the libraries in # In addition to the normal sequential way, the default is to also build # profiled prelude libraries. @@ -391,15 +399,15 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO) # -dcore-lint or -H32m. The ones that are *essential* are wired into # the build system. # -# -O is pretty desirable, otherwise no inlining of prelude +# -O(2) is pretty desirable, otherwise no inlining of prelude # things (incl "+") happens when compiling with this compiler # -# -fgenerics switches on generation of support code for +# -XGenerics switches on generation of support code for # derivable type classes. This is now off by default, # but we switch it on for the libraries so that we generate # the code in case someone importing wants it -GhcLibHcOpts=-O -Rghc-timing -fgenerics +GhcLibHcOpts=-O2 -Rghc-timing -XGenerics # Win32 only: Enable the RTS and libraries to be built as DLLs DLLized=@EnableWin32DLLs@ @@ -460,7 +468,8 @@ GhcRtsWithFrontPanel = NO # Include support for CPU performance counters via the PAPI library in the RTS? # (PAPI: http://icl.cs.utk.edu/papi/) GhcRtsWithPapi = NO -HavePapi = @HavePapi@ +PapiLibDir= +PapiIncludeDir= ################################################################################ # @@ -681,7 +690,7 @@ INSTALL_DIR = $(MKDIRHIER) # # SRC_HC_OPTS += -O -SRC_HC_OPTS += -H16m -O +SRC_HC_OPTS += -H32m -O # These flags make flex 8-bit SRC_FLEX_OPTS += -8 @@ -755,7 +764,7 @@ GHC_UNLIT_DIR = $(FPTOOLS_TOP)/$(GHC_UNLIT_DIR_REL) GHC_HP2PS_DIR = $(FPTOOLS_TOP)/$(GHC_HP2PS_DIR_REL) GHC_HSTAGS_DIR = $(FPTOOLS_TOP)/$(GHC_HSTAGS_DIR_REL) GHC_GHCTAGS_DIR = $(FPTOOLS_TOP)/$(GHC_GHCTAGS_DIR_REL) -GHC_HSC2HS_DIR = $(FPTOOLS_TOP)/$(GHC_HSC2HS_DIR_REL) +GHC_HSC2HS_DIR = $(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL) GHC_TOUCHY_DIR = $(FPTOOLS_TOP)/$(GHC_TOUCHY_DIR_REL) GHC_PKG_DIR = $(FPTOOLS_TOP)/$(GHC_PKG_DIR_REL) GHC_GENPRIMOP_DIR = $(FPTOOLS_TOP)/$(GHC_GENPRIMOP_DIR_REL) @@ -803,7 +812,7 @@ GHC_UNLIT_PGM = unlit$(exeext) GHC_HP2PS_PGM = hp2ps GHC_HSTAGS_PGM = hasktags GHC_GHCTAGS_INPLACE_PGM = ghctags-inplace -GHC_HSC2HS_INPLACE_PGM = hsc2hs-inplace +GHC_HSC2HS_INPLACE_PGM = hsc2hs GHC_TOUCHY_PGM = touchy$(exeext) GHC_MANGLER_PGM = ghc-asm GHC_SPLIT_PGM = ghc-split @@ -829,7 +838,7 @@ UNLIT = $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM) HP2PS = $(GHC_HP2PS_DIR)/$(GHC_HP2PS_PGM) HSTAGS = $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM) GHCTAGS_INPLACE = $(GHC_GHCTAGS_DIR)/$(GHC_GHCTAGS_INPLACE_PGM) -HSC2HS_INPLACE = $(GHC_HSC2HS_DIR)/$(GHC_HSC2HS_INPLACE_PGM) +HSC2HS_INPLACE = $(GHC_HSC2HS_DIR)/install-inplace/bin/$(GHC_HSC2HS_INPLACE_PGM) MANGLER = $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM) SPLIT = $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM) SYSMAN = $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM) @@ -860,8 +869,8 @@ EXECUTABLE_FILE = chmod +x GHC = @WithGhc@ GhcDir = $(dir $(GHC)) -# Set to YES if $(GHC) has the readline package installed -GhcHasReadline = @GhcHasReadline@ +# Set to YES if $(GHC) has the editline package installed +GhcHasEditline = @GhcHasEditline@ HBC = @HBC@ NHC = @NHC@ @@ -875,6 +884,8 @@ GHC_STAGE1 = $(GHC_COMPILER_DIR)/stage1/ghc-inplace -no-user-package-conf GHC_STAGE2 = $(GHC_COMPILER_DIR)/stage2/ghc-inplace -no-user-package-conf GHC_STAGE3 = $(GHC_COMPILER_DIR)/stage3/ghc-inplace -no-user-package-conf +BOOTSTRAPPING_CONF = $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf + # NOTE: add -no-user-package-conf for stage 1-3 above, so that # we avoid picking up any packages the user might happen to have # installed for this GHC version. They are bound to be incompatible @@ -897,11 +908,14 @@ GhcMinVersion = @GhcMinVersion@ ghc_ge_605 = YES ghc_ge_607 = YES +ghc_ge_609 = YES else # not UseStage1 or BootingFromHc HC = @WithHc@ MKDEPENDHS = $(GHC) +BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS = -package-conf $(BOOTSTRAPPING_CONF) +BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS = -package-conf $(BOOTSTRAPPING_CONF) GhcVersion = @GhcVersion@ GhcPatchLevel = @GhcPatchLevel@ GhcMajVersion = @GhcMajVersion@ @@ -910,6 +924,7 @@ GhcMinVersion = @GhcMinVersion@ # Some useful GHC version predicates: ghc_ge_605 = @ghc_ge_605@ ghc_ge_607 = @ghc_ge_607@ +ghc_ge_609 = @ghc_ge_609@ endif # Canonicalised ghc version number, used for easy (integer) version @@ -948,6 +963,22 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux" SRC_CC_OPTS += -G0 endif +SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS))) +SRC_HSC2HS_OPTS += --cc=$(CC) +SRC_HSC2HS_OPTS += --ld=$(CC) +SRC_HSC2HS_OPTS += --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) +SRC_HSC2HS_OPTS += --lflag=-no-auto-link-packages +SRC_HSC2HS_OPTS += -I$(GHC_INCLUDE_DIR_ABS) +SRC_HSC2HS_OPTS += -I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild + +# Given +# foo bar +# make +# :\"-Ifoo\":\"-Ibar\" +nothing= +space=$(nothing) $(nothing) +SRC_HSC2HS_OPTS += $(subst $(space),,$(foreach d,$(GMP_INCLUDE_DIRS),:\"-I$(d)\")) + #----------------------------------------------------------------------------- # GMP Library (version 2.0.x or above) # @@ -1231,7 +1262,7 @@ WAY_thr_debug_NAME=threaded WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG # Way 'thr_debug_p': -WAY_thr_debug_p_NAME=threaded +WAY_thr_debug_p_NAME=threaded debug profiling WAY_thr_debug_p_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG -prof # Way 'dyn': build dynamic shared libraries