X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=980e493f0178f96467d84946971efb6da8ce9890;hp=106d7aabfe2d5c2f542dd418a260e542b919dadd;hb=34cc75e1a62638f2833815746ebce0a9114dc26b;hpb=a549d46404a69374ebe9d07a94006e8bd4f53ad5 diff --git a/mk/config.mk.in b/mk/config.mk.in index 106d7aa..980e493 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -32,123 +32,11 @@ $(error GNU make version 3.79.1 or later is required.) endif endif -################################################################################ -# -# GHC Version -# - -# ProjectVersion is treated as a *string* -# ProjectVersionInt is treated as an *integer* (for cpp defines) - -# Versioning scheme: A.B.C -# A: major version, decimal, any number of digits -# B: minor version, decimal, any number of digits -# C: patchlevel, one digit, omitted if zero. -# -# ProjectVersionInt does *not* contain the patchlevel (rationale: this -# figure is used for conditional compilations, and library interfaces -# etc. are not supposed to change between patchlevels). -# -# The ProjectVersionInt is included in interface files, and GHC -# checks that it's reading interface generated by the same ProjectVersion -# as itself. It does this even though interface file syntax may not -# change between versions. Rationale: calling conventions or other -# random .o-file stuff might change even if the .hi syntax doesn't - -ProjectName = @ProjectName@ -ProjectTags = -ProjectVersion = @ProjectVersion@$(ProjectTags) -ProjectVersionInt = @ProjectVersionInt@ -ProjectPatchLevel = @ProjectPatchLevel@ - -################################################################################ -# -# Platform variables -# -################################################################################ +# TOP: the top of the fptools hierarchy, absolute path. +# On Windows this is a c:/foo/bar style path. +TOP = @hardtop@ -# A "platform" is the GNU cpu-type/manufacturer/operating-system target machine -# specifier. E.g. sparc-sun-solaris2 -# -# Build platform: the platform on which we are doing this build -# Host platform: the platform on which these binaries will run -# Target platform: the platform for which this compiler will generate code -# -# We don't support build & host being different, because the build -# process creates binaries that are run during the build, and also -# installed. -# -# If host & target are different, then we are building a compiler -# which will generate intermediate .hc files to port to the target -# architecture for bootstrapping. The libraries and stage 2 compiler -# will be built as HC files for the target system, and likely won't -# build on this host platform. -# -# An important invariant is that for any piece of source code, the -# platform on which the code is going to run is the HOST platform, -# and the platform on which we are building is the BUILD platform. -# Additionally for the compiler, the platform this compiler will -# generate code for is the TARGET. TARGET is not meaningful outside -# the compiler sources. -# -# Guidelines for when to use HOST vs. TARGET: -# -# - In the build system (Makefile, foo.mk), normally we should test -# $(HOSTPLATFORM). There are some cases (eg. installation), where -# we expect $(HOSTPLATFORM)==$(TARGETPLATFORM), so in those cases it -# doesn't matter which is used. -# -# - In the compiler itself, we should test HOST or TARGET depending -# on whether the conditional relates to the code being generated, or -# the platform on which the compiler is running. See the section -# on "Coding Style" in the commentary for more details. -# -# - In all other code, we should be testing HOST only. -# -# NOTE: cross-compiling is not well supported by the build system. -# You have to do a lot of work by hand to cross compile: see the -# section on "Porting GHC" in the Building Guide. - -HOSTPLATFORM = @HostPlatform@ -TARGETPLATFORM = @TargetPlatform@ -BUILDPLATFORM = @BuildPlatform@ - -# Hack alert: -# in one or two places, we need to get at the OS version (major and -# perhaps even minor), HostOS_Full is the OS name reported by -# AC_CANONICAL_SYSTEM. -# -HostPlatform_CPP = @HostPlatform_CPP@ -HostArch_CPP = @HostArch_CPP@ -HostOS_CPP = @HostOS_CPP@ -HostOS_Full = @HostOS_Full@ -HostVendor_CPP = @HostVendor_CPP@ - -TargetPlatform_CPP = @TargetPlatform_CPP@ -TargetArch_CPP = @TargetArch_CPP@ -TargetOS_CPP = @TargetOS_CPP@ -TargetVendor_CPP = @TargetVendor_CPP@ - -BuildPlatform_CPP = @BuildPlatform_CPP@ -BuildArch_CPP = @BuildArch_CPP@ -BuildOS_CPP = @BuildOS_CPP@ -BuildVendor_CPP = @BuildVendor_CPP@ - -@HostPlatform_CPP@_HOST = 1 -@TargetPlatform_CPP@_TARGET = 1 -@BuildPlatform_CPP@_BUILD = 1 - -@HostArch_CPP@_HOST_ARCH = 1 -@TargetArch_CPP@_TARGET_ARCH = 1 -@BuildArch_CPP@_BUILD_ARCH = 1 - -@HostOS_CPP@_HOST_OS = 1 -@TargetOS_CPP@_TARGET_OS = 1 -@BuildOS_CPP@_BUILD_OS = 1 - -@HostVendor_CPP@_HOST_VENDOR = 1 -@TargetVendor_CPP@_TARGET_VENDOR = 1 -@BuildVendor_CPP@_BUILD_VENDOR = 1 +include $(TOP)/mk/project.mk ################################################################################ # @@ -156,22 +44,6 @@ BuildVendor_CPP = @BuildVendor_CPP@ # ################################################################################ -# Leading underscores on symbol names in object files -# Valid options: YES/NO -# -LeadingUnderscore=@LeadingUnderscore@ - -# Pin a suffix on executables? If so, what (Windows only). -exeext=@exeext@ -soext=@soext@ - -# Windows=YES if on a Windows platform -ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32)" "" -Windows=YES -else -Windows=NO -endif - # BootingFromHc - build GHC and the libraries from .hc files? BootingFromHc = @BootingFromHc@ @@ -185,6 +57,30 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@ # XMLDocWays= +# 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 +111,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 @@ -246,9 +148,8 @@ endif # # Target platforms supported: # i386, powerpc -# sparc has bitrotted # AIX is not supported -ArchSupportsNCG=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc))) +ArchSupportsNCG=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc sparc))) OsSupportsNCG=$(strip $(patsubst $(HostOS_CPP), YES, $(patsubst aix,,$(HostOS_CPP)))) # lazy test, because $(GhcUnregisterised) might be set in build.mk later. @@ -256,9 +157,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,19 +226,23 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS))) HscIfaceFileVersion=6 -MakefileDeps=YES - #------------------------------------------------------------------------------ # Options for Libraries -# What extra ways to build the libraries in +# Which directory (in libraries/) contains the integer library? +INTEGER_LIBRARY=integer-gmp + +# We build the libraries at least the "vanilla" way (way "v") +GhcLibWays = v + # In addition to the normal sequential way, the default is to also build -# profiled prelude libraries. -# When booting from .hc files, turn this off. -ifeq "$(BootingFromHc)" "YES" -GhcLibWays= -else -GhcLibWays=p +# profiled prelude libraries unless we are booting from .hc files +ifneq "$(BootingFromHc)" "YES" +GhcLibWays += p +endif + +ifeq "$(BuildSharedLibs)" "YES" +GhcLibWays += dyn endif # In addition, the RTS is built in some further variations. Ways that @@ -350,23 +252,30 @@ 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 # debug_t : debugging ticky-ticky profiling +# l : event logging +# thr_l : threaded and event logging +# thr_debug_l : threaded and debugging and event logging # -GhcRTSWays= +GhcRTSWays=l # Usually want the debug version 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. -GhcRTSWays += $(if $(findstring NO, $(GhcUnregisterised)),thr thr_p thr_debug,) +GhcRTSWays += $(if $(findstring NO, $(GhcUnregisterised)),thr thr_debug thr_l,) +GhcRTSWays += $(if $(findstring p, $(GhcLibWays)),$(if $(findstring NO, $(GhcUnregisterised)),thr_p,),) # We can only build GHCi threaded if we have a threaded RTS: GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO) @@ -376,15 +285,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 -XGenerics # Win32 only: Enable the RTS and libraries to be built as DLLs DLLized=@EnableWin32DLLs@ @@ -407,25 +316,26 @@ PackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE} # system needs to do other special magic if you are # doing object-file splitting +ArchSupportsSplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),YES,NO)) + # lazy test, so that $(GhcUnregisterised) can be set in build.mk -SplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),\ - $(if $(filter YES,$(BootingFromHC)),\ - NO,\ - $(if $(filter NO,$(GhcUnregisterised)),\ - YES,\ - NO)),\ - NO)) +SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\ + $(if $(filter NO,$(BootingFromHc)),\ + $(if $(filter NO,$(GhcUnregisterised)),\ + YES,\ + NO),\ + NO),\ + NO)) + +# By default, enable SplitObjs for the libraries if this build supports it +SplitObjs=$(SupportsSplitObjs) # Math library LIBM=@LIBM@ -# Build the ObjectIO ? -# -GhcLibsWithObjectIO=@GhcLibsWithObjectIO@ - # .NET interop support? # -DotnetSupport=@DotnetSupport@ +DotnetSupport=NO # Build unix package? # @@ -445,7 +355,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 +414,15 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" DEFAULT_TMPDIR = /C/TEMP endif -# FPTOOLS_TOP: 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_TOPDIR_ABS=$(TOP) 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=$(TOP)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar +BIN_DIST_TAR_BZ2=$(BIN_DIST_TAR).bz2 +BIN_DIST_PREP_DIR=$(TOP)/bindist-prep +BIN_DIST_PREP=$(BIN_DIST_PREP_DIR)/$(BIN_DIST_NAME) +BIN_DIST_LIST=$(TOP)/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,14 +469,15 @@ 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. datarootdir := $(prefix) -datadir := $(prefix) -libdir := $(prefix) +datadir := $(prefix)/lib +libdir := $(prefix)/lib docdir := $(prefix)/doc htmldir := $(docdir) @@ -579,9 +489,14 @@ 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) +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. @@ -612,11 +527,6 @@ 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 - #----------------------------------------------------------------------------- # install configuration @@ -642,6 +552,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,19 +578,13 @@ 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__ @@ -680,114 +597,62 @@ GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__ ################################################################################ # Here we provide defines for the various directories in the source tree, -# so we can move things around more easily. A define $(GHC_FOO_DIR_REL) -# indicates a directory relative to the top of the source tree, whereas -# $(GHC_FOO_DIR) is a directory relative to the current directory. -# $(GHC_FOO_DIR_ABS) is the absolute path to the directory. - -GHC_UTILS_DIR_REL = utils -GHC_INCLUDE_DIR_REL = includes -GHC_COMPILER_DIR_REL = compiler -GHC_RTS_DIR_REL = rts -GHC_UTILS_DIR_REL = utils -GHC_DRIVER_DIR_REL = driver -GHC_COMPAT_DIR_REL = compat - -GHC_MKDEPENDC_DIR_REL = $(GHC_UTILS_DIR_REL)/mkdependC -GHC_LTX_DIR_REL = $(GHC_UTILS_DIR_REL)/ltx -GHC_RUNTEST_DIR_REL = $(GHC_UTILS_DIR_REL)/runstdtest -GHC_LNDIR_DIR_REL = $(GHC_UTILS_DIR_REL)/lndir -GHC_MKDIRHIER_DIR_REL = $(GHC_UTILS_DIR_REL)/mkdirhier -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_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 -GHC_GENPRIMOP_DIR_REL = $(GHC_UTILS_DIR_REL)/genprimopcode -GHC_GENAPPLY_DIR_REL = $(GHC_UTILS_DIR_REL)/genapply - -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 - -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) -GHC_RTS_DIR = $(FPTOOLS_TOP)/$(GHC_RTS_DIR_REL) -GHC_UTILS_DIR = $(FPTOOLS_TOP)/$(GHC_UTILS_DIR_REL) -GHC_DRIVER_DIR = $(FPTOOLS_TOP)/$(GHC_DRIVER_DIR_REL) -GHC_COMPAT_DIR = $(FPTOOLS_TOP)/$(GHC_COMPAT_DIR_REL) - -GHC_MKDEPENDC_DIR = $(FPTOOLS_TOP)/$(GHC_MKDEPENDC_DIR_REL) -GHC_LTX_DIR = $(FPTOOLS_TOP)/$(GHC_LTX_DIR_REL) -GHC_RUNTEST_DIR = $(FPTOOLS_TOP)/$(GHC_RUNTEST_DIR_REL) -GHC_LNDIR_DIR = $(FPTOOLS_TOP)/$(GHC_LNDIR_DIR_REL) -GHC_MKDIRHIER_DIR = $(FPTOOLS_TOP)/$(GHC_MKDIRHIER_DIR_REL) -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_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) -GHC_GENAPPLY_DIR = $(FPTOOLS_TOP)/$(GHC_GENAPPLY_DIR_REL) - -GHC_MANGLER_DIR = $(FPTOOLS_TOP)/$(GHC_MANGLER_DIR_REL) -GHC_SPLIT_DIR = $(FPTOOLS_TOP)/$(GHC_SPLIT_DIR_REL) -GHC_SYSMAN_DIR = $(FPTOOLS_TOP)/$(GHC_SYSMAN_DIR_REL) - -GHC_UTILS_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_UTILS_DIR_REL) -GHC_INCLUDE_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL) -GHC_COMPILER_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL) -GHC_RTS_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL) -GHC_UTILS_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_UTILS_DIR_REL) -GHC_DRIVER_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_DRIVER_DIR_REL) -GHC_COMPAT_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_COMPAT_DIR_REL) - -GHC_MKDEPENDC_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_MKDEPENDC_DIR_REL) -GHC_LTX_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_LTX_DIR_REL) -GHC_RUNTEST_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_RUNTEST_DIR_REL) -GHC_LNDIR_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_LNDIR_DIR_REL) -GHC_MKDIRHIER_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_MKDIRHIER_DIR_REL) -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_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_MANGLER_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_MANGLER_DIR_REL) -GHC_SYSMAN_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_SYSMAN_DIR_REL) -GHC_SPLIT_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_SPLIT_DIR_REL) +# so we can move things around more easily. A define $(GHC_FOO_DIR) +# indicates a directory relative to the top of the source tree. + +GHC_UTILS_DIR = utils +GHC_INCLUDE_DIR = includes +GHC_COMPILER_DIR = compiler +GHC_PROG_DIR = ghc +GHC_RTS_DIR = rts +GHC_DRIVER_DIR = driver +GHC_COMPAT_DIR = compat + +GHC_MKDEPENDC_DIR = $(GHC_UTILS_DIR)/mkdependC +GHC_LTX_DIR = $(GHC_UTILS_DIR)/ltx +GHC_RUNTEST_DIR = $(GHC_UTILS_DIR)/runstdtest +GHC_LNDIR_DIR = $(GHC_UTILS_DIR)/lndir +GHC_MKDIRHIER_DIR = $(GHC_UTILS_DIR)/mkdirhier +GHC_DOCBOOK_DIR = $(GHC_UTILS_DIR)/docbook +GHC_UNLIT_DIR = $(GHC_UTILS_DIR)/unlit +GHC_HP2PS_DIR = $(GHC_UTILS_DIR)/hp2ps +GHC_HSTAGS_DIR = $(GHC_UTILS_DIR)/hasktags +GHC_GHCTAGS_DIR = $(GHC_UTILS_DIR)/ghctags +GHC_HSC2HS_DIR = $(GHC_UTILS_DIR)/hsc2hs +GHC_TOUCHY_DIR = $(GHC_UTILS_DIR)/touchy +GHC_PKG_DIR = $(GHC_UTILS_DIR)/ghc-pkg +GHC_GENPRIMOP_DIR = $(GHC_UTILS_DIR)/genprimopcode +GHC_GENAPPLY_DIR = $(GHC_UTILS_DIR)/genapply +GHC_CABAL_DIR = $(GHC_UTILS_DIR)/ghc-cabal +GHC_MANGLER_DIR = $(GHC_DRIVER_DIR)/mangler +GHC_SPLIT_DIR = $(GHC_DRIVER_DIR)/split +GHC_SYSMAN_DIR = $(GHC_RTS_DIR)/parallel # ----------------------------------------------------------------------------- # Names of programs in the GHC tree # -# xxx_PGM the name of an executable, without the path -# xxx the executable relative to the current dir - -GHC_UNLIT_PGM = unlit$(exeext) -GHC_HP2PS_PGM = hp2ps -GHC_HSTAGS_PGM = hasktags -GHC_HSC2HS_INPLACE_PGM = hsc2hs-inplace -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 -GHC_LTX_PGM = ltx -GHC_MKDIRHIER_PGM = mkdirhier -GHC_LNDIR_PGM = lndir -GHC_RUNTEST_PGM = runstdtest +# xxx_PGM the name of an executable, without the path +# xxx the executable relative to the current dir + +GHC_UNLIT_PGM = unlit$(exeext) +GHC_HP2PS_PGM = hp2ps$(exeext) +GHC_HSTAGS_PGM = hasktags$(exeext) +GHC_GHCTAGS_PGM = ghctags$(exeext) +GHC_HSC2HS_PGM = hsc2hs$(exeext) +GHC_TOUCHY_PGM = touchy$(exeext) +GHC_MANGLER_PGM = ghc-asm +GHC_SPLIT_PGM = ghc-split +GHC_SYSMAN_PGM = SysMan +GHC_GENPRIMOP_PGM = genprimopcode$(exeext) +GHC_GENAPPLY_PGM = genapply$(exeext) +GHC_CABAL_PGM = ghc-cabal$(exeext) +GHC_PKG_PGM = ghc-pkg$(exeext) +GHC_MKDEPENDC_PGM = mkdependC +GHC_LTX_PGM = ltx$(exeext) +GHC_MKDIRHIER_PGM = mkdirhier +GHC_LNDIR_PGM = lndir +GHC_RUNTEST_PGM = runstdtest +GHC_DUMMY_GHC_PGM = dummy-ghc$(exeext) ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" GHC_CP = "xcopy /y" @@ -797,22 +662,32 @@ GHC_CP = $(CP) GHC_PERL = $(PERL) 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) -MANGLER = $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM) -SPLIT = $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM) +MANGLER = $(INPLACE_LIB)/$(GHC_MANGLER_PGM) +SPLIT = $(INPLACE_LIB)/$(GHC_SPLIT_PGM) SYSMAN = $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM) -GHC_PKG_INPLACE = $(GHC_PKG_DIR)/$(GHC_PKG_INPLACE_PGM) -GENPRIMOP = $(GHC_GENPRIMOP_DIR)/$(GHC_GENPRIMOP_PGM) -GENAPPLY = $(GHC_GENAPPLY_DIR)/$(GHC_GENAPPLY_PGM) -MKDEPENDC = $(GHC_MKDEPENDC_DIR)/$(GHC_MKDEPENDC_PGM) LTX = $(GHC_LTX_DIR)/$(GHC_LTX_PGM) -MKDIRHIER = $(GHC_MKDIRHIER_DIR)/$(GHC_MKDIRHIER_PGM) LNDIR = $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM) RUNTEST = $(GHC_RUNTEST_DIR)/$(GHC_RUNTEST_PGM) +INPLACE = inplace +INPLACE_BIN = $(INPLACE)/bin +INPLACE_LIB = $(INPLACE)/lib +INPLACE_MINGW = $(INPLACE)/mingw + +UNLIT = $(INPLACE_LIB)/$(GHC_UNLIT_PGM) +TOUCHY = $(INPLACE_LIB)/$(GHC_TOUCHY_PGM) +MKDIRHIER = $(INPLACE_BIN)/$(GHC_MKDIRHIER_PGM) +MKDEPENDC = $(INPLACE_BIN)/$(GHC_MKDEPENDC_PGM) +GHC_CABAL_INPLACE = $(INPLACE_BIN)/$(GHC_CABAL_PGM) +GENAPPLY_INPLACE = $(INPLACE_BIN)/$(GHC_GENAPPLY_PGM) +GHC_PKG_INPLACE = $(INPLACE_BIN)/$(GHC_PKG_PGM) +GHCTAGS_INPLACE = $(INPLACE_BIN)/$(GHC_GHCTAGS_PGM) +HSC2HS_INPLACE = $(INPLACE_BIN)/$(GHC_HSC2HS_PGM) +GENPRIMOP_INPLACE = $(INPLACE_BIN)/$(GHC_GENPRIMOP_PGM) +DUMMY_GHC_INPLACE = $(INPLACE_BIN)/$(GHC_DUMMY_GHC_PGM) + GENERATED_FILE = chmod a-w EXECUTABLE_FILE = chmod +x @@ -828,11 +703,18 @@ EXECUTABLE_FILE = chmod +x # NOTE: Don't override $(GHC) in build.mk, use configure --with-ghc instead # (because the version numbers have to be calculated). -GHC = @WithGhc@ +GHC := @WithGhc@ +# If we have a make dependency on c:/ghc/ghc, and the file is actually +# called c:/ghc/ghc.exe, then make will think that ghc doesn't exist +# and that it doesn't know how to create it. +ifneq "$(wildcard $(GHC).exe)" "" +GHC := $(GHC).exe +endif + 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@ @@ -841,45 +723,32 @@ 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) -ifneq "$(findstring YES, $(UseStage1) $(BootingFromHc))" "" +GHC_STAGE0_ABS = $(GHC) +GHC_STAGE1_ABS = $(TOP)/$(INPLACE_BIN)/ghc-stage1$(exeext) +GHC_STAGE2_ABS = $(TOP)/$(INPLACE_BIN)/ghc-stage2$(exeext) +GHC_STAGE3_ABS = $(TOP)/$(INPLACE_BIN)/ghc-stage3$(exeext) -# We are using the stage1 compiler to compile Haskell code, set up -# some variables appropriately: -HC =$(GHC_STAGE1) -MKDEPENDHS =$(GHC_STAGE1) -GhcVersion = @ProjectVersion@ -GhcPatchLevel = @ProjectPatchLevel@ -# oops, these are wrong: -GhcMajVersion = @GhcMajVersion@ -GhcMinVersion = @GhcMinVersion@ +GHC_STAGE0 = $(GHC) +GHC_STAGE1 = $(INPLACE_BIN)/ghc-stage1$(exeext) +GHC_STAGE2 = $(INPLACE_BIN)/ghc-stage2$(exeext) +GHC_STAGE3 = $(INPLACE_BIN)/ghc-stage3$(exeext) + +# Install stage 2 by default, can be changed to 3 +INSTALL_GHC_STAGE=2 -ghc_ge_601 = YES -ghc_ge_602 = YES -ghc_ge_603 = YES -ghc_ge_605 = YES -ghc_ge_607 = YES +BOOTSTRAPPING_CONF = libraries/bootstrapping.conf -else # not UseStage1 or BootingFromHc +INPLACE_PACKAGE_CONF = $(INPLACE_LIB)/package.conf -HC = @WithHc@ -MKDEPENDHS = $(GHC) 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@ -endif +ghc_ge_609 = @ghc_ge_609@ # Canonicalised ghc version number, used for easy (integer) version # comparisons. We must expand $(GhcMinVersion) to two digits by @@ -906,7 +775,6 @@ ifneq "$(strip $(UseGcc))" "YES" CC = cc else CC = $(WhatGccIsCalled) - GccDir = $(dir $(WhatGccIsCalled)) endif endif @@ -917,6 +785,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) # @@ -969,7 +840,7 @@ INSTALL = @INSTALL@ # install-sh script (if chosen). This not terribly useful to us, so we convert # it into an abs. path. # -INSTALL := $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL)) +INSTALL := $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL)) LATEX = latex HEVEA = hevea HACHA = hacha @@ -1023,9 +894,12 @@ LdIsGNULd = @LdIsGNULd@ REAL_SHELL=$(SHELL) SIZE = size STRIP = strip +PATCH = @PatchCmd@ TAR = @TarCmd@ ZIP = zip +HSCOLOUR = @HSCOLOUR@ + # # This is special to literate/, ToDo: add literate-specific # configure setup to literate/. @@ -1069,12 +943,6 @@ XSLTPROC_LABEL_OPTS = --stringparam toc.section.depth 3 \ BLD_DLL = dllwrap # -# .NET support software -# -ILX2IL = ilx2il -ILASM = ilasm - -# # ghc-pkg # GHC_PKG = @GhcPkgCmd@ @@ -1093,11 +961,11 @@ HAPPY_VERSION = @HappyVersion@ # # Options to pass to Happy when we're going to compile the output with GHC # -GHC_HAPPY_OPTS = -agc +SRC_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. -SRC_HAPPY_OPTS = +RTS -K2m -RTS +SRC_HAPPY_OPTS += +RTS -K2m -RTS # # Alex @@ -1107,12 +975,16 @@ ALEX_VERSION = @AlexVersion@ # # Options to pass to Happy when we're going to compile the output with GHC # -GHC_ALEX_OPTS = -g +SRC_ALEX_OPTS = -g -# -# Haddock -# -HADDOCK = @HaddockCmd@ +# Should we build haddock docs? +HADDOCK_DOCS = YES +# And HsColour the sources? +ifeq "$(HSCOLOUR)" "" +HSCOLOUR_SRCS = NO +else +HSCOLOUR_SRCS = YES +endif # # Options for compiling in different `ways'. @@ -1138,20 +1010,20 @@ 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=v p t l s mp mg debug dyn thr thr_l debug_dyn thr_dyn thr_debug_dyn thr_p thr_debug thr_debug_l 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. # # If you want to add to these default options, fill in the variables below: -# Way 'i': -WAY_i_NAME=ILX -WAY_i_HC_OPTS= -filx -fruntime-types +# Way 'v': +WAY_v_NAME=vanilla +WAY_v_HC_OPTS= # Way 'p': WAY_p_NAME=profiling @@ -1161,9 +1033,9 @@ 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 'l': +WAY_l_NAME=event logging +WAY_l_HC_OPTS= -eventlog # Way `mp': WAY_mp_NAME=parallel @@ -1185,6 +1057,10 @@ WAY_thr_HC_OPTS=-optc-DTHREADED_RTS WAY_thr_p_NAME=threaded profiled WAY_thr_p_HC_OPTS=-optc-DTHREADED_RTS -prof +# Way 'thr_l': +WAY_thr_l_NAME=threaded event logging +WAY_thr_l_HC_OPTS=-optc-DTHREADED_RTS -eventlog + # Way 'debug': WAY_debug_NAME=debug WAY_debug_HC_OPTS=-optc-DDEBUG @@ -1193,10 +1069,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,9 +1078,13 @@ 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 'thr_debug_l': +WAY_thr_debug_l_NAME=threaded debug event logging +WAY_thr_debug_l_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG -eventlog + # Way 'dyn': build dynamic shared libraries WAY_dyn_NAME=dyn WAY_dyn_HC_OPTS=-fPIC -dynamic @@ -1304,3 +1180,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 = $(TOP)/bindisttest/$(BIN_DIST_INST_SUBDIR) +