X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=495194d28abb28f6d8468a048e53c611cdc016e5;hp=640f33e45b9e1d7b71a512aefe8be5e2b1e1b939;hb=9efc323b5b57a0b4d50008c942a90a45dc51ee2d;hpb=e05f9de137269701df667b69d741dfae616694f7 diff --git a/mk/config.mk.in b/mk/config.mk.in index 640f33e..495194d 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -185,6 +185,35 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@ # XMLDocWays= +# Should we build haddock docs? +HADDOCK_DOCS = YES +# And HsColour the sources? +HSCOLOUR_SRCS = YES + +# Should we build latex docs? +LATEX_DOCS = NO + +# 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,11 +244,17 @@ 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 +GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO) + +# Build shared and/or static libs? +BuildSharedLibs=@BuildSharedLibs@ +# ToDo later: +# BuildStaticLibs=@BuildStaticLibs@ # Build a compiler that will build *unregisterised* libraries and # binaries by default. Unregisterised code is supposed to compile and @@ -256,9 +291,6 @@ GhcWithNativeCodeGen=$(strip\ $(if $(filter YESYESNO,\ $(OsSupportsNCG)$(ArchSupportsNCG)$(GhcUnregisterised)),YES,NO)) -# Include support for generating Java -GhcWithJavaGen=NO - HaveLibDL = @HaveLibDL@ # ArchSupportsSMP should be set iff there is support for that arch in @@ -328,11 +360,12 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS))) HscIfaceFileVersion=6 -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. @@ -343,6 +376,10 @@ else GhcLibWays=p endif +ifeq "$(BuildSharedLibs)" "YES" +GhcLibWays += dyn +endif + # In addition, the RTS is built in some further variations. Ways that # make sense here: # @@ -350,7 +387,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 @@ -363,6 +399,10 @@ ifeq "$(BootingFromHc)" "NO" GhcRTSWays += debug endif +ifeq "$(BuildSharedLibs)" "YES" +GhcRTSWays += dyn debug_dyn thr_dyn thr_debug_dyn +endif + # Want the threaded versions unless we're unregisterised # Defer the check until later by using $(if..), because GhcUnregisterised might # be set in build.mk, which hasn't been read yet. @@ -376,15 +416,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@ @@ -419,13 +459,9 @@ SplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),\ # Math library LIBM=@LIBM@ -# Build the ObjectIO ? -# -GhcLibsWithObjectIO=@GhcLibsWithObjectIO@ - # .NET interop support? # -DotnetSupport=@DotnetSupport@ +DotnetSupport=NO # Build unix package? # @@ -445,7 +481,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= ################################################################################ # @@ -503,17 +540,19 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" DEFAULT_TMPDIR = /C/TEMP endif -# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. +# FPTOOLS_TOP_ABS: the top of the fptools hierarchy, absolute path. # On Windows this is a c:/foo/bar style path. 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_NAME=ghc-$(ProjectVersion) +BIN_DIST_TAR=$(FPTOOLS_TOP_ABS)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar +BIN_DIST_TAR_BZ2=$(BIN_DIST_TAR).bz2 +BIN_DIST_PREP_DIR=$(FPTOOLS_TOP_ABS)/bindist-prep +BIN_DIST_PREP=$(BIN_DIST_PREP_DIR)/$(BIN_DIST_NAME) +BIN_DIST_LIST=$(FPTOOLS_TOP_ABS)/bindist-list # 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 +599,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. @@ -569,17 +609,24 @@ datarootdir := $(prefix) datadir := $(prefix) libdir := $(prefix) +docdir := $(prefix)/doc +htmldir := $(docdir) +dvidir := $(docdir) +pdfdir := $(docdir) +psdir := $(docdir) + else # Unix: override libdir and datadir to put ghc-specific stuff in # a subdirectory with the version number included. +# +# datadir is set to libdir here as GHC needs package.conf and unlit +# to be in the same place (and things like ghc-pkg need to agree on +# where package.conf is, so we just set it globally). +# datarootdir := $(datadir0) -datadir := $(datadir0)/ghc-$(ProjectVersion) libdir := $(libdir0)/ghc-$(ProjectVersion) - -endif # Windows - -headerdir := $(libdir)/include +datadir := $(libdir) # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags. # However, in order to support older autoconf's we don't use them. @@ -596,6 +643,10 @@ dvidir := $(docdir) pdfdir := $(docdir) psdir := $(docdir) +endif # Windows + +headerdir := $(libdir)/include + # Default place for putting interface files is $(libdir) # (overriden for packages in package.mk) ifacedir = $(libdir) @@ -606,10 +657,7 @@ ifacedir = $(libdir) # (NOTE: configure script setting is ignored). libexecdir = $(libdir) -# This is a bit of a lie, as this is a wrapper rather than the program -# itself. However, it means that we don't have to worry about Windows -# and non-Windows having different extensions. -GHC_PKG_PROG = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace +GHC_PKG_PROG = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/install-inplace/bin/ghc-pkg #----------------------------------------------------------------------------- # install configuration @@ -636,6 +684,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 @@ -649,19 +710,17 @@ 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 # Default fptools options for dllwrap. -SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32 +SRC_BLD_DLL_OPTS += --target=i386-mingw32 # Flags for CPP when running GreenCard on .pgc files GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__ @@ -681,7 +740,7 @@ GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__ GHC_UTILS_DIR_REL = utils GHC_INCLUDE_DIR_REL = includes -GHC_COMPILER_DIR_REL = compiler +GHC_COMPILER_DIR_REL = ghc GHC_RTS_DIR_REL = rts GHC_UTILS_DIR_REL = utils GHC_DRIVER_DIR_REL = driver @@ -696,6 +755,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 @@ -706,6 +766,8 @@ GHC_MANGLER_DIR_REL = $(GHC_DRIVER_DIR_REL)/mangler GHC_SPLIT_DIR_REL = $(GHC_DRIVER_DIR_REL)/split GHC_SYSMAN_DIR_REL = $(GHC_RTS_DIR_REL)/parallel +INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir + GHC_UTILS_DIR = $(FPTOOLS_TOP)/$(GHC_UTILS_DIR_REL) GHC_INCLUDE_DIR = $(FPTOOLS_TOP)/$(GHC_INCLUDE_DIR_REL) GHC_COMPILER_DIR = $(FPTOOLS_TOP)/$(GHC_COMPILER_DIR_REL) @@ -723,7 +785,8 @@ 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_HSC2HS_DIR = $(FPTOOLS_TOP)/$(GHC_HSC2HS_DIR_REL) +GHC_GHCTAGS_DIR = $(FPTOOLS_TOP)/$(GHC_GHCTAGS_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) @@ -750,11 +813,13 @@ 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) GHC_GENPRIMOP_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_GENPRIMOP_DIR_REL) GHC_GENAPPLY_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_GENAPPLY_DIR_REL) +GHC_COMPILER_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL) GHC_MANGLER_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_MANGLER_DIR_REL) GHC_SYSMAN_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_SYSMAN_DIR_REL) @@ -769,12 +834,12 @@ 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_HSC2HS_INPLACE_PGM = hsc2hs-inplace +GHC_GHCTAGS_INPLACE_PGM = ghctags-inplace +GHC_HSC2HS_INPLACE_PGM = hsc2hs GHC_TOUCHY_PGM = touchy$(exeext) GHC_MANGLER_PGM = ghc-asm GHC_SPLIT_PGM = ghc-split GHC_SYSMAN_PGM = SysMan -GHC_PKG_INPLACE_PGM = ghc-pkg-inplace GHC_GENPRIMOP_PGM = genprimopcode GHC_GENAPPLY_PGM = genapply GHC_MKDEPENDC_PGM = mkdependC @@ -794,11 +859,12 @@ endif UNLIT = $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM) HP2PS = $(GHC_HP2PS_DIR)/$(GHC_HP2PS_PGM) HSTAGS = $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM) -HSC2HS_INPLACE = $(GHC_HSC2HS_DIR)/$(GHC_HSC2HS_INPLACE_PGM) +GHCTAGS_INPLACE = $(GHC_GHCTAGS_DIR)/$(GHC_GHCTAGS_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) -GHC_PKG_INPLACE = $(GHC_PKG_DIR)/$(GHC_PKG_INPLACE_PGM) +GHC_PKG_INPLACE = $(GHC_PKG_PROG) GENPRIMOP = $(GHC_GENPRIMOP_DIR)/$(GHC_GENPRIMOP_PGM) GENAPPLY = $(GHC_GENAPPLY_DIR)/$(GHC_GENAPPLY_PGM) MKDEPENDC = $(GHC_MKDEPENDC_DIR)/$(GHC_MKDEPENDC_PGM) @@ -825,8 +891,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@ @@ -835,44 +901,63 @@ NHC = @NHC@ # places (eg. it's handy to have a nofib & a ghc build in the same # 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_INPLACE = $(GHC_STAGE1) +GHC_STAGE1 = $(GHC_COMPILER_DIR_ABS)/stage1-inplace/ghc +GHC_STAGE2 = $(GHC_COMPILER_DIR_ABS)/stage2-inplace/ghc +GHC_STAGE3 = $(GHC_COMPILER_DIR_ABS)/stage3-inplace/ghc +# XXX All those used to have -no-user-package-conf, but then we can't +# pass them to Cabal + +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 +# 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 # some variables appropriately: HC =$(GHC_STAGE1) MKDEPENDHS =$(GHC_STAGE1) +USE_NEW_MKDEPEND_FLAGS = YES GhcVersion = @ProjectVersion@ GhcPatchLevel = @ProjectPatchLevel@ # oops, these are wrong: GhcMajVersion = @GhcMajVersion@ GhcMinVersion = @GhcMinVersion@ -ghc_ge_601 = YES -ghc_ge_602 = YES -ghc_ge_603 = YES -ghc_ge_605 = YES ghc_ge_607 = YES +ghc_ge_609 = YES else # not UseStage1 or BootingFromHc +# Some useful GHC version predicates: +ghc_ge_607 = @ghc_ge_607@ +ghc_ge_609 = @ghc_ge_609@ + HC = @WithHc@ MKDEPENDHS = $(GHC) +USE_NEW_MKDEPEND_FLAGS = $(ghc_ge_609) GhcVersion = @GhcVersion@ GhcPatchLevel = @GhcPatchLevel@ 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@ +# We build a few packages using the installed GHC as part of the +# bootstrapping process. These are installed into a local +# package.conf file, $(BOOTSTRAPPING_CONF). When we invoke the +# installed GHC we need to pass it -package-conf $(BOOTSTRAPPING_CONF). +# So the following variables expand to -package-conf $(BOOTSTRAPPING_CONF) +# when $(HC) does *not* point to one of the GHC binaries built in +# the local tree. +# +BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS =$(if $(findstring inplace, $(HC)),,-package-conf $(BOOTSTRAPPING_CONF)) +BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS =$(if $(findstring inplace, $(MKDEPENDHS)),,-package-conf $(BOOTSTRAPPING_CONF)) endif # Canonicalised ghc version number, used for easy (integer) version @@ -911,6 +996,9 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux" SRC_CC_OPTS += -G0 endif +SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS))) +SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d)) + #----------------------------------------------------------------------------- # GMP Library (version 2.0.x or above) # @@ -1020,6 +1108,8 @@ STRIP = strip TAR = @TarCmd@ ZIP = zip +HSCOLOUR = @HSCOLOUR@ + # # This is special to literate/, ToDo: add literate-specific # configure setup to literate/. @@ -1087,7 +1177,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. @@ -1104,11 +1194,6 @@ ALEX_VERSION = @AlexVersion@ GHC_ALEX_OPTS = -g # -# Haddock -# -HADDOCK = @HaddockCmd@ - -# # Options for compiling in different `ways'. # # To configure up your own way, have a look at some of the standard ways @@ -1132,11 +1217,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. @@ -1155,10 +1240,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 @@ -1187,10 +1268,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 @@ -1200,7 +1277,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 @@ -1298,3 +1375,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) +