X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=12795234b8d54ab15ea9daa1fc4195bf5af68337;hp=106d7aabfe2d5c2f542dd418a260e542b919dadd;hb=9f592bb0ae0dc76bd3ec7729474057d2069bb4db;hpb=a549d46404a69374ebe9d07a94006e8bd4f53ad5 diff --git a/mk/config.mk.in b/mk/config.mk.in index 106d7aa..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. @@ -350,7 +374,6 @@ endif # thr_p : threaded profiled # debug : debugging (compile with -g for the C compiler, and -DDEBUG) # debug_p : debugging profiled -# debug_u : debugging unregisterised # thr_debug : debugging threaded # thr_debug_p : debugging threaded profiled # t : ticky-ticky profiling @@ -376,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 @@ -384,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@ @@ -508,12 +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_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed +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 @@ -560,8 +580,9 @@ datadir0 := @datadir@ libdir0 := @libdir@ includedir := @includedir@ mandir := @mandir@ +dynlibdir := @libdir@ -ifeq "$(Windows)" "YES" +ifeq "$(RelocatableBuild)" "YES" # Hack: our directory layouts tend to be different on Windows, so # hack around configure's bogus assumptions here. @@ -642,6 +663,19 @@ INSTALL_HEADER = $(INSTALL) -m 644 INSTALL_MAN = $(INSTALL) -m 644 INSTALL_DIR = $(MKDIRHIER) +# +# runhaskell and hsc2hs are special, in that other compilers besides +# GHC might provide them. Systems with a package manager often come +# with tools to manage this kind of clash, e.g. RPM's +# update-alternatives. When building a distribution for such a system, +# we recommend setting both of the following to 'YES'. +# +# NO_INSTALL_RUNHASKELL = YES +# NO_INSTALL_HSC2HS = YES +# +# NB. we use negative tests here because for binary-distributions we cannot +# test build-time variables at install-time, so they must default to on. + # ----------------------------------------------------------------------------- # Utilities programs: flags @@ -655,13 +689,11 @@ 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 -SRC_INSTALL_BIN_OPTS += -s - # lint gets all CPP's flags too SRC_LINT_OPTS += -axz -DLINT $(SRC_CPP_OPTS) WAY$(_way)_LINT_OPTS += WAY$(_way)_CPP_OPTS @@ -702,6 +734,7 @@ GHC_DOCBOOK_DIR_REL = $(GHC_UTILS_DIR_REL)/docbook GHC_UNLIT_DIR_REL = $(GHC_UTILS_DIR_REL)/unlit GHC_HP2PS_DIR_REL = $(GHC_UTILS_DIR_REL)/hp2ps GHC_HSTAGS_DIR_REL = $(GHC_UTILS_DIR_REL)/hasktags +GHC_GHCTAGS_DIR_REL = $(GHC_UTILS_DIR_REL)/ghctags GHC_HSC2HS_DIR_REL = $(GHC_UTILS_DIR_REL)/hsc2hs GHC_TOUCHY_DIR_REL = $(GHC_UTILS_DIR_REL)/touchy GHC_PKG_DIR_REL = $(GHC_UTILS_DIR_REL)/ghc-pkg @@ -729,6 +762,7 @@ GHC_DOCBOOK_DIR = $(FPTOOLS_TOP)/$(GHC_DOCBOOK_DIR_REL) 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_TOUCHY_DIR = $(FPTOOLS_TOP)/$(GHC_TOUCHY_DIR_REL) GHC_PKG_DIR = $(FPTOOLS_TOP)/$(GHC_PKG_DIR_REL) @@ -756,6 +790,7 @@ GHC_DOCBOOK_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_DOCBOOK_DIR_REL) GHC_UNLIT_DIR = $(FPTOOLS_TOP_ABS)/$(GHC_UNLIT_DIR_REL) GHC_HP2PS_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_HP2PS_DIR_REL) GHC_HSTAGS_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_HSTAGS_DIR_REL) +GHC_GHCTAGS_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_GHCTAGS_DIR_REL) GHC_HSC2HS_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL) GHC_TOUCHY_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_TOUCHY_DIR_REL) GHC_PKG_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL) @@ -775,6 +810,7 @@ GHC_SPLIT_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_SPLIT_DIR_REL) 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_TOUCHY_PGM = touchy$(exeext) GHC_MANGLER_PGM = ghc-asm @@ -800,6 +836,7 @@ endif 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) MANGLER = $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM) SPLIT = $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM) @@ -831,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@ @@ -842,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 @@ -858,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 @@ -874,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 @@ -1026,6 +1065,8 @@ STRIP = strip TAR = @TarCmd@ ZIP = zip +HSCOLOUR = @HSCOLOUR@ + # # This is special to literate/, ToDo: add literate-specific # configure setup to literate/. @@ -1093,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. @@ -1138,11 +1179,11 @@ HADDOCK = @HaddockCmd@ # # The ways currently defined. # -ALL_WAYS=p t u s mp mg a b c d e f g h i j k l m n o A B +ALL_WAYS=p t s mp mg a b c d e f g h i j k l m n o A B USER_WAYS=a b c d e f g h j k l m n o A B # -# The following ways currently have treated specially, p u t mg, +# The following ways currently have treated specially, p t mg, # as the driver script treats these guys specially and needs to carefully be told # about the options for these. Hence, we hide the required command line options # for these in the driver, as this is the only place they are needed. @@ -1161,10 +1202,6 @@ WAY_p_HC_OPTS= -prof WAY_t_NAME=ticky-ticky profiling WAY_t_HC_OPTS= -ticky -# Way `u': -WAY_u_NAME=unregisterized (using portable C only) -WAY_u_HC_OPTS=-unreg - # Way `mp': WAY_mp_NAME=parallel WAY_mp_HC_OPTS=-parallel @@ -1193,10 +1230,6 @@ WAY_debug_HC_OPTS=-optc-DDEBUG WAY_debug_p_NAME=debug profiled WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof -# Way 'debug_u': -WAY_debug_u_NAME=debug unregisterised -WAY_debug_u_HC_OPTS=-optc-DDEBUG -unreg - # Way 'debug_t': WAY_debug_t_NAME=debug ticky-ticky profiling WAY_debug_t_HC_OPTS= -ticky -optc-DDEBUG @@ -1206,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 @@ -1304,3 +1337,18 @@ WAY_o_HC_OPTS= CONFIGURE_ARGS = @CONFIGURE_ARGS@ +################################################################################ +# +# Bindist testing directory +# +################################################################################ + +ifeq "$(Windows)" "YES" +BIN_DIST_INST_SUBDIR = "install dir" +else +# I very much doubt that paths with spaces will work on Unix +BIN_DIST_INST_SUBDIR = installed +endif + +BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/$(BIN_DIST_INST_SUBDIR) +