X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=12795234b8d54ab15ea9daa1fc4195bf5af68337;hp=1ce9751b026898a6936b3723c30731de29e3004d;hb=9f592bb0ae0dc76bd3ec7729474057d2069bb4db;hpb=88e09197fcd710148c7a6b990b9a2b4706b49881 diff --git a/mk/config.mk.in b/mk/config.mk.in index 1ce9751..1279523 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -185,6 +185,27 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@ # XMLDocWays= +# Mac OS X deployment target (to cross-compile for older OS versions) +# +MACOSX_DEPLOYMENT_VERSION = @MACOSX_DEPLOYMENT_VERSION@ +MACOSX_DEPLOYMENT_SDK = @MACOSX_DEPLOYMENT_SDK@ + +ifneq "$(MACOSX_DEPLOYMENT_VERSION)" "" +MACOSX_DEPLOYMENT_CC_OPTS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_VERSION) \ + -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 + ################################################################################ # # Variables that control how the compiler itself is built @@ -215,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 @@ -333,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. @@ -375,7 +399,7 @@ 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 @@ -383,7 +407,7 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO) # 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 -fgenerics # Win32 only: Enable the RTS and libraries to be built as DLLs DLLized=@EnableWin32DLLs@ @@ -507,10 +531,9 @@ endif FPTOOLS_TOP_ABS = @hardtop@ BIN_DIST_NAME=ghc-$(ProjectVersion) -BIN_DIST_TOPDIR_REL=$(FPTOOLS_TOP) BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS) BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME) -BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR_REL)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2 +BIN_DIST_TARBALL=$(FPTOOLS_TOP_ABS)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2 # Definition of installation directories, we don't use half of these, but since # the configure script has them on offer while passing through, we might as well @@ -666,7 +689,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 @@ -845,8 +868,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@ @@ -856,10 +879,18 @@ NHC = @NHC@ # tree). We can refer to "this ghc" as $(GHC_INPLACE): GHC_INPLACE = $(GHC_COMPILER_DIR)/ghc-inplace -GHC_STAGE1 = $(GHC_COMPILER_DIR)/stage1/ghc-inplace -GHC_STAGE2 = $(GHC_COMPILER_DIR)/stage2/ghc-inplace -GHC_STAGE3 = $(GHC_COMPILER_DIR)/stage3/ghc-inplace +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 +# 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 +# with the packages we built in the tree. + +ifeq "$(stage)" "2" + UseStage1 = YES +endif ifneq "$(findstring YES, $(UseStage1) $(BootingFromHc))" "" # We are using the stage1 compiler to compile Haskell code, set up @@ -872,9 +903,6 @@ GhcPatchLevel = @ProjectPatchLevel@ GhcMajVersion = @GhcMajVersion@ GhcMinVersion = @GhcMinVersion@ -ghc_ge_601 = YES -ghc_ge_602 = YES -ghc_ge_603 = YES ghc_ge_605 = YES ghc_ge_607 = YES @@ -888,9 +916,6 @@ GhcMajVersion = @GhcMajVersion@ GhcMinVersion = @GhcMinVersion@ # Some useful GHC version predicates: -ghc_ge_601 = @ghc_ge_601@ -ghc_ge_602 = @ghc_ge_602@ -ghc_ge_603 = @ghc_ge_603@ ghc_ge_605 = @ghc_ge_605@ ghc_ge_607 = @ghc_ge_607@ endif @@ -1109,7 +1134,7 @@ HAPPY_VERSION = @HappyVersion@ # # Options to pass to Happy when we're going to compile the output with GHC # -GHC_HAPPY_OPTS = -agc +GHC_HAPPY_OPTS = -agc --strict # Temp. to work around performance problems in the HEAD around 8/12/2003, # A Happy compiled with this compiler needs more stack. @@ -1214,7 +1239,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