X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=0f7dc76fb63ceffe686dbc46d59ad4c99c872409;hb=22f40af747bb2d6b26b8755e539560db1c5814d1;hp=83b6fb190a6193c4d9be536304a84a932715aa7a;hpb=1de036725ecf2b163bb619dbfb4c7e39b1cd4ae5;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 83b6fb1..0f7dc76 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -1,7 +1,7 @@ # # @configure_input@ # -################################################################################# +################################################################################ # # config.mk.in-template # @@ -9,7 +9,7 @@ # a particular build. # # -################################################################################# +################################################################################ # The configuration is defined in two steps: # @@ -38,14 +38,64 @@ # included by boilerplate.mk (see boilerplate.mk for a list). +################################################################################ +# +# Project-wide platform variables +# +################################################################################ + +# A "platform" is the GNU cpu-type/manufacturer/operating-system target machine +# specifier. E.g. sparc-sun-solaris2 + +HOSTPLATFORM = @HostPlatform@ +TARGETPLATFORM = @TargetPlatform@ +BUILDPLATFORM = @HostPlatform@ + +# 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@ -################################################################################# +# +# ToDo: check if these can be purged now. -- sof +# + +@HostPlatform_CPP@_HOST = 1 +@HostPlatform_CPP@_TARGET = 1 +@HostPlatform_CPP@_BUILD = 1 + +@HostArch_CPP@_HOST_ARCH = 1 +@HostArch_CPP@_TARGET_ARCH = 1 +@HostArch_CPP@_BUILD_ARCH = 1 + +@HostOS_CPP@_HOST_OS = 1 +@HostOS_CPP@_TARGET_OS = 1 +@HostOS_CPP@_BUILD_OS = 1 + +@HostVendor_CPP@_HOST_VENDOR = 1 +@HostVendor_CPP@_TARGET_VENDOR = 1 +@HostVendor_CPP@_BUILD_VENDOR = 1 + +# Leading underscores on symbol names in object files +# Valid options: YES/NO +# +LeadingUnderscore=@LeadingUnderscore@ + +# Pin a suffix on executables? If so, what. (cygwin32 only). +exeext=@exeext@ + +################################################################################ # # project-wide flags # # Set of options applicable to all fptools projects # -################################################################################# +################################################################################ # # What parts to build: An fptools build tree does not have to be built @@ -56,66 +106,52 @@ # projects use others you must list them in the correct order. # # Generally: * glafp-utils should be first -# * literate next # * happy next -# * ghc&hslibs next +# * ghc next # then it's up to you -ProjectsToBuild = glafp-utils literate ghc hslibs +ProjectsToBuild = glafp-utils ghc hslibs +# +# Make a distinction between building and installing +# +ProjectsToInstall = glafp-utils ghc hslibs # # Should the various project tests directories be built? # IncludeTestDirsInBuild=NO -################################################################################# +################################################################################ # # GHC project # # Set of (configurable) options needed by the ghc tree # plus their default options (if any). # -################################################################################# - -# -# Name variables for ghc: -# -GhcProjectName =The Glorious Glasgow Haskell Compilation System -GhcProjectNameShort =ghc -GhcProjectVersion =2.02 -GhcProjectPatchLevel =0 -GhcBuildeeVersion =202 -GhcBuilderVersion =29 - -# -# Name variables for the fptools, for now equal to the above -# ghc stuff -# -ProjectName =$(GhcProjectName) -ProjectNameShort =$(GhcProjectNameShort) -ProjectVersion =$(GhcProjectVersion) -ProjectPatchLevel =$(GhcProjectPatchLevel) - +################################################################################ #--------------------------------------------------------------- # # Variables that control how the compiler itself is built +# +#--------------------------------------------------------------- # Specify the Haskell compiler to be used to compile the compiler itself -# WithGhcHc Path name of the compiler to use -# Ghc2_0 Whether this compiler is GHC 2.0 or later -# (which affects gruesome details about -# how mutually recursive modules are handled) -# WithGhcHcType What "type" of compiler is being used -# Valid options: +# +# WithGhcHc Path name of the compiler to use +# +# WithGhcHcType What "type" of compiler is being used +# Valid options: # HC_CHALMERS_HBC # HC_GLASGOW_GHC # HC_ROJEMO_NHC # HC_UNSPECIFIED -WithGhcHc = ghc-0.29 -Ghc2_0=NO -# Unused, we think -# WithGhcHcType=HC_GLASGOW_GHC + +WithGhcHc = @WithHc@ + +# Variable which is set to the version number of the $(WithGhcHc) we're using. +# Not currently used, but might come in handy sometime soon. +#WithGhcHcVersion = $(shell echo `if ( $(WithGhcHc) --version 2>/dev/null >/dev/null ) then $(WithGhcHc) --version 2>&1 | @SedCmd@ -e 's/^.*version [^0-9]*\([.0-9]*\).*/\1/;s/\.//'; else echo unknown; fi; ` ) # Extra ways in which to build the compiler (for example, you might want to # build a profiled compiler so you can see where it spends its time) @@ -124,23 +160,21 @@ GhcCompilerWays= # Extra option flags to pass to the compiler that compiles the compiler # (Ones that are essential are wired into ghc/compiler/Makefile) # Typical ones: -# -O compiler an optimised compiler +# -H25m allocate a bigger heap (might speed up compilation) +# +# -O compile an optimised compiler +# # -DDEBUG include consistency/assertion checks in the compiled compiler -# -fshow-import-specs show import specialisations -GhcHcOpts= +# +# -dcore-lint check the types after every pass of the compiler; +# a pretty strong internal check +GhcHcOpts=-O # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files? -GhcWithHscBuiltViaC=NO - -# Build hsc with -O and turn optimising flag on when compiling -# the intermediate C file -GhcUseGccForOptAsm=YES - -# Compile intermediate C file with debugging options set. -GhcUseGccForDebuggingAsm=YES +GhcWithHscBuiltViaC=@BootingFromHc@ # Build a registerised version of hsc and runtime -# (you'd be desperate or silly not to). +# (unregisterised used for Hugs at the moment) GhcWithRegisterised=YES # Build a compiler with a native code generator backend @@ -148,96 +182,144 @@ GhcWithRegisterised=YES # # Target platforms supported: # i386, alpha & sparc -GhcWithNativeCodeGen=YES - -# Build the compiler with the deforester included? -GhcWithDeforester=NO +GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha sparc) = x); then echo NO; else echo YES; fi) +# +# Building various ways? +# (right now, empty if not). +BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS))) +BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS))) -#--------------------------------------------------------------- +# Include compiler support for letting the compiler (optionally) report +# your compilation to a central server for generation of fun stats. # -# Variables that control how the prelude libararies and runtime system are built +GhcReportCompiles=NO + +#------------------------------------------------------------------------------ +# Options for GHC's Prelude # What extra ways to build the libraries in # 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 "$(GhcWithHscBuiltViaC)" "YES" +GhcLibWays= +else GhcLibWays=p +endif # Option flags to pass to GHC when it's compiling prelude modules # Typically these are things like -O or -dcore-lint # The ones that are *essential* are wired into ghc/lib/Makefile -GhcLibHcOpts= -split-objs -odir $(basename $*) +# +# -O is pretty desirable, otherwise no inlining of prelude +# things (incl "+") happens when compiling with this compiler +GhcLibHcOpts=-O + +# Win32 only: Enable the RTS and libraries to be built as DLLs +# Don't split object files for libs if we're building DLLs +EnableWin32DLLs=@EnableWin32DLLs@ +ifeq "($EnableWin32DLLs)" "YES" +SplitObjs=NO +else +SplitObjs=YES +endif -################################################################################# + +# Strip local symbols from libraries? This can make the libraries smaller, +# but makes debugging somewhat more difficult. Doesn't work with all ld's. # -# hslibs project +StripLibraries=NO + +# ---------------------------------------------------------------------------- +# Options for GHC's RTS + +# This is a good way to set things like -optc-g and -optc-DDEBUG for the RTS. +# GhcRtsHcOpts is used when compiling .hc files and .c files. +# GhcRtsCcOpts is used when compiling .c files only. + +# For a debugging RTS: +# GhcRtsHcOpts = -optc-DDEBUG +# GhcRtsCcOpts = -optc-g + +# For an optimised RTS: +GhcRtsHcOpts=-O2 +GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer + +################################################################################ # -# Set of (configurable) options needed by the Haskell libraries (hslibs) -# plus their default options (if any). +# hslibs project # -################################################################################# +################################################################################ + +# Build HsLibs for which compiler? + +# If $(HsLibsFor) == hugs or ghc, we assume we're building for the +# compiler/interpreter in the same source tree. + +# HsLibsFor = ghc | hugs | nhc | hbc +HsLibsFor = ghc + +# hslibs for GHC also uses the following variables (defined above): +# GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, EnableWin32DLLs, StripLibraries + +# Haskell compiler options for tools in hslibs +GhcLibToolsHcOpts=-O # Build the Haskell Readline bindings? # -HsLibsWithReadline=NO -# +GhcLibsWithReadline=@HaveReadlineHeaders@ + +# Libraries needed for linking with readline +LibsReadline=@LibsReadline@ + # Include path to readline.h # (no path == in standard include path) # ReadlineIncludePath= -# Build the socket libraries? -# -HsLibsWithSockets=YES - -# -# The different ways to build hslibs. Default is just to mirror -# what is done for the ghc prelude libraries. -# -HsLibWays=$(GhcLibWays) - -# Option flags for hslibs are by default the same as for the options -# used for the prelude libs (see above). -HsLibHcOpts=$(GhcLibHcOpts) - -################################################################################# +################################################################################ # # happy project # # Happy specific options # -################################################################################# +################################################################################ +# The compiler you'd like to use to compile Happy +WithHappyHc = @WithHc@ +# HappyHcOpts gives the flags to pass to the Haskell compiler used +# to compile the Happy sources with. +# +HappyHcOpts = -O -################################################################################# +################################################################################ # # haggis project # # Haggis specific options # -################################################################################# - - +################################################################################ -################################################################################# +################################################################################ # # green-card project # # Green-card specific options # -################################################################################# +################################################################################ - -################################################################################# +################################################################################ # # nofib project # # nofib specific options # -################################################################################# +################################################################################ +WithNofibHc = $(GHC_INPLACE) # NoFibSubDirs controls which set of tests should be run # You can run one or more of @@ -246,18 +328,17 @@ HsLibHcOpts=$(GhcLibHcOpts) # real # parallel # PRIVATE -# GHC_ONLY # PENDING # UNUSED -NoFibSubDirs = imaginary spectral real GHC_ONLY PRIVATE +NoFibSubDirs = imaginary spectral real # The different ways to build nofib. Default is just to mirror # what is done for the ghc prelude libraries. # -NoFibWays=$(GhcLibWays) +NoFibWays = $(GhcLibWays) # Haskell compiler options for nofib -NoFibHcOpts= +NoFibHcOpts = -O # ============================================================================== # @@ -267,11 +348,16 @@ NoFibHcOpts= # # ============================================================================== -################################################################################# +################################################################################ # # Paths (see paths.mk) # -################################################################################# +################################################################################ + +# Directory used by GHC (and possibly other tools) for storing +# temporary files. If your /tmp isn't big enough, either override +# this in build.mk or set your environment variable "TMPDIR" to point +# to somewhere with more space. (TMPDIR=. is a good choice). TMPDIR = /tmp @@ -287,24 +373,64 @@ FPTOOLS_TOP_ABS = @hardtop@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ +#UNUSED, see below: libexecdir = @libexecdir@ datadir = @datadir@ -sysconfdir = @datadir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ +#sysconfdir = @datadir@ +#sharedstatedir = @sharedstatedir@ +#localstatedir = @localstatedir@ libdir = @libdir@ infodir = @infodir@ includedir = @includedir@ oldincludedir = @oldincludedir@ mandir = @mandir@ -srcdir = @srcdir@ +#UNUSED:srcdir = @srcdir@ + +# +# Default values for most of the above are only set if +# they weren't configured to anything in particular +# via the configure script. (i.e., we make no assumption +# that the autoconf-generated script will assign defaults +# to all of the above). +# +ifeq "$(strip $(exec_prefix))" "" +exec_prefix = $(prefix) +endif +ifeq "$(strip $(bindir))" "" +bindir = $(exec_prefix)/bin +endif + +# +# NOTE: by intention, libexecdir and libdir point to +# the same place. +# => Only way to override this is to set libexecdir= on the command line. +# (NOTE: configure script setting is ignored). +libexecdir = $(libdir) + +ifeq "$(strip $(datadir))" "" +datadir = $(prefix)/share +endif +ifeq "$(strip $(libdir))" "" +libdir = $(exec_prefix)/lib +endif +ifeq "$(strip $(infodir))" "" +infodir = $(prefix)/info +endif +ifeq "$(strip $(includedir))" "" +includedir = $(prefix)/include +endif +ifeq "$(strip $(oldincludedir))" "" +oldincludedir = /usr/include +endif +ifeq "$(strip $(mandir))" "" +mandir = $(prefix)/man +endif + -################################################################################# +################################################################################ # # Utilities programs: flags # -################################################################################# +################################################################################ # If you want to give any standard flags to pretty much any utility # (see utils.mk for a complete list), by adding a line here @@ -317,54 +443,11 @@ srcdir = @srcdir@ # SRC_HC_OPTS += -O -################################################################################# -# -# Platform -# -################################################################################# - -# A "platform" is the GNU cpu-type/manufacturer/operating-system target machine -# specifier. E.g. sparc-sun-solaris2 - -HOSTPLATFORM = @HostPlatform@ -TARGETPLATFORM = @TargetPlatform@ -BUILDPLATFORM = @HostPlatform@ - -HostPlatform_CPP = @HostPlatform_CPP@ -HostArch_CPP = @HostArch_CPP@ -HostOS_CPP = @HostOS_CPP@ -HostVendor_CPP = @HostVendor_CPP@ - -# -# ToDo: check if these can be purged now. -- sof -# - -@HostPlatform_CPP@_HOST = 1 -@HostPlatform_CPP@_TARGET = 1 -@HostPlatform_CPP@_BUILD = 1 - -@HostArch_CPP@_HOST_ARCH = 1 -@HostArch_CPP@_TARGET_ARCH = 1 -@HostArch_CPP@_BUILD_ARCH = 1 - -@HostOS_CPP@_HOST_OS = 1 -@HostOS_CPP@_TARGET_OS = 1 -@HostOS_CPP@_BUILD_OS = 1 - -@HostVendor_CPP@_HOST_VENDOR = 1 -@HostVendor_CPP@_TARGET_VENDOR = 1 -@HostVendor_CPP@_BUILD_VENDOR = 1 - -# Leading underscores on symbol names in object files -# Valid options: YES/NO -# -LeadingUnderscore=@LeadingUnderscore@ - -################################################################################# +################################################################################ # # Utilities programs: where to find them # -################################################################################# +################################################################################ #----------------------------------------------------------------------------- # FPtools Utility locations @@ -380,19 +463,19 @@ LeadingUnderscore=@LeadingUnderscore@ # override the various *_PREFIX in build.mk, i.e., having the following # in build.mk: # -# FASTMAKE_PREFIX= +# MKDEPENDC_PREFIX= # -# will force `make' to rummage around in your PATH to find `fastmake' (not +# will force `make' to rummage around in your PATH to find `mkdependC' (not # sure it would need it in the first place, but still). # GLAFP_UTILS = $(FPTOOLS_TOP)/glafp-utils SCRIPT_PREFIX = $(GLAFP_UTILS)/scripts/ -FASTMAKE_PREFIX = $(GLAFP_UTILS)/fastmake/ MKDEPENDC_PREFIX = $(GLAFP_UTILS)/mkdependC/ LTX_PREFIX = $(GLAFP_UTILS)/ltx/ RUNTEST_PREFIX = $(GLAFP_UTILS)/runstdtest/ VERBATIM_PREFIX = $(GLAFP_UTILS)/verbatim/ +SGMLVERB_PREFIX = $(GLAFP_UTILS)/sgmlverb/ ETAGS_PREFIX = $(GLAFP_UTILS)/etags/ MSUB_PREFIX = $(GLAFP_UTILS)/msub/ LNDIR_PREFIX = $(GLAFP_UTILS)/lndir/ @@ -406,6 +489,7 @@ INFO_PREFIX = $(FPTOOLS_TOP)/literate/info-utils/ TEXI2HTML_PREFIX = $(LITERATE_PREFIX)texi2html/ HAPPY_PREFIX = $(FPTOOLS_TOP)/happy/src/ +GREENCARD_PREFIX = $(FPTOOLS_TOP)/green-card/src/ UNLIT_PREFIX = $(FPTOOLS_TOP)/ghc/utils/unlit/ UGEN_PREFIX = $(FPTOOLS_TOP)/ghc/utils/ugen/ @@ -416,17 +500,26 @@ HSTAGS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hstags/ #----------------------------------------------------------------------------- -# Haskell compiler and mkdependHS +# Haskell compilers and mkdependHS -HC = $(FPTOOLS_TOP)/ghc/driver/ghc +# $(GHC), $(HBC) and $(NHC) point to installed versions of the relevant +# compilers, if available. +# +# $(HC) is a generic Haskell 98 compiler, set to $(GHC) by default. +# $(MKDEPENDHS) is the Haskell dependency generator (ghc -M). + +GHC = @GHC@ +HBC = @HBC@ +NHC = @NHC@ + +HC = @WithHc@ MKDEPENDHS = $(HC) -# -# The compiler proper is built with the 1.2 compiler, -# so when building the dependencies, we need mkdependHS -# for the 1.2 compiler. -# -MKDEPENDHS_1_2 = mkdependHS-1.2 +# Sometimes we want to invoke ghc from the build tree in different +# projects (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 = $(FPTOOLS_TOP)/ghc/driver/ghc-inplace #----------------------------------------------------------------------------- # C compiler @@ -434,7 +527,7 @@ MKDEPENDHS_1_2 = mkdependHS-1.2 # HaveGcc = @HaveGcc@ UseGcc = YES -WhatGccIsCalled = gcc +WhatGccIsCalled = @WhatGccIsCalled@ ifeq "$(strip $(HaveGcc))" "YES" ifneq "$(strip $(UseGcc))" "YES" CC = cc @@ -444,10 +537,18 @@ endif endif #----------------------------------------------------------------------------- +# GMP Library (version 2.0.x or above) +# +HaveLibGmp = @HaveLibGmp@ +LibGmp = @LibGmp@ + +#----------------------------------------------------------------------------- # Flex FLEX = @LEX@ -FLEX_LIB = @LEXLIB@ +# Don't bother with -lfl, we define our own yywrap()s anyway. +FLEX_LIB = +#WAS:FLEX_LIB = @LEXLIB@ #----------------------------------------------------------------------------- # Other standard (ha!) Unix utilities @@ -463,19 +564,17 @@ COMPRESS_SUFFIX = @CompressSuffix@ CONTEXT_DIFF = @ContextDiffCmd@ CP = cp -CPP = @RAWCPP@ +CPP = @CPP@ CTAGS = $(ETAGS) -RAWCPP = @RAWCPP@ -GNUCPP = @GNUCPP@ +RAWCPP = $(CPP) -undef -traditional +FIND = @FindCmd@ INSTALL = @INSTALL@ # # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback # install-sh script (if chosen). This not terribly useful to us, so we convert # it into an abs. path. # -if "$(INSTALL)" ".././install-sh" -INSTALL = $(FPTOOLS_TOP_ABS)/install-sh -endif +INSTALL := $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL)) LATEX = latex LN_S = @LN_S@ MANMACROS = -man @@ -490,9 +589,39 @@ RANLIB = @RANLIB@ RM = rm -f SED = @SedCmd@ SHELL = /bin/sh +# +# In emergency situations, REAL_SHELL is used to perform shell commands +# from within the ghc driver script, by scribbling the command line to +# a temp file and then having $(REAL_SHELL) execute it. +# +# The reason for having to do this is that overly long command lines +# cause unnecessary trouble with some shells (e.g., /bin/sh on Solaris +# 2.5.1), which is why this backdoor is provided. The situation of overly +# long command lines is either encountered while doing `make boot' in ghc/compiler, +# or when linking the compiler binary (`hsc'). +# +# We do not use SHELL to execute long commands, as `make' will more than likely +# override whatever setting you have in your environment while executing. + +# By default, REAL_SHELL is set equal SHELL, which is not really a smart move +# as it is SHELL that will show up the bogosity in the first place, but setting +# it to anything else isn't really portable. +# +# ====> If long command lines cause you trouble, invoke `ghc' (via `make' or otherwise) +# with REAL_SHELL set to something else than /bin/sh, for instance, your favourite +# command shell. +# +REAL_SHELL=$(SHELL) SIZE = size STRIP = strip TAR = @TarCmd@ +ZIP = zip + +# +# Under cygwin32, we have to deal with .exe suffixes +# +EXE_SUFFIX=@ExeSuffix@ + # # This is special to literate/, ToDo: add literate-specific # configure setup to literate/. @@ -508,26 +637,40 @@ TROFF = troff UNAME = uname YACC = @YaccCmd@ +#----------------------------------------------------------------------------- +# SGML stuff (currently not configured - we assume you have it) + +SGML2DVI = db2dvi +SGML2HTML = db2html +SGML2PS = db2ps +SGML2RTF = db2rtf + +SGMLSTYLESHEET = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl + +SRC_SGML2DVI_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2HTML_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2PS_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2RTF_OPTS = -d $(SGMLSTYLESHEET) #----------------------------------------------------------------------------- # FPtools support software # Stuff from fptools/glafp-utils MKDEPENDC = $(MKDEPENDC_PREFIX)mkdependC -FASTMAKE = $(FASTMAKE_PREFIX)fastmake LTX = $(LTX_PREFIX)ltx MKDIRHIER = $(MKDIRHIER_PREFIX)mkdirhier LNDIR = $(LNDIR_PREFIX)lndir MSUB = $(MSUB_PREFIX)msub ETAGS = $(ETAGS_PREFIX)etags VERBATIM = $(VERBATIM_PREFIX)verbatim +SGMLVERB = $(SGMLVERB_PREFIX)sgmlverb RUNTEST = $(RUNTEST_PREFIX)runstdtest HAPPY = @HappyCmd@ +HAPPY_VERSION = @HappyVersion@ LX = @LxCmd@ +GREENCARD = $(FPTOOLS_TOP)/green-card/src/green-card -ifeq "$(HAPPY)" "" -HAPPY = $(HAPPY_PREFIX)happy -endif +BLD_DLL = dllwrap # # Stuff from fptools/literate @@ -558,7 +701,7 @@ HSTAGS = $(HSTAGS_PREFIX)hstags # Options for the compiling different `ways'. Various projects within # the glorious fptools tree support building in various user-configured # ways. For instance, you could set up one `way' such that the prelude -# libraries and hslibs all were built with the option -ffoldr-build-on. +# libraries all were built with the option -ffoldr-build-on. # # To configure up your own way, have a look at some of the standard ways # such as profiling, and create your own set of WAY_*_OPTS defs below. @@ -590,60 +733,44 @@ HSTAGS = $(HSTAGS_PREFIX)hstags # # The ways currently defined. # -ALL_WAYS=p t u mc mr mt mp mg 1s 2s du a b c d e f g h i j k l m n o A B +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 +USER_WAYS=a b c d e f g h i j k l m n o A B # -# The following ways currently have treated specially, p u t mc mt my mp mg 1s 2d du, +# The following ways currently have treated specially, p u 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 ghc/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 'p': WAY_p_NAME=profiling WAY_p_HC_OPTS= -prof -# Way t: +# Way 't': 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= +WAY_u_HC_OPTS=-unreg -# Way `mc': concurrent -WAY_mc_NAME=concurrent -WAY_mc_HC_OPTS=-concurrent - -# Way `mr': -WAY_mr_NAME=profiled concurrent -WAY_mr_HC_OPTS=-prof -concurrent - -# Way `mt': -WAY_mt_NAME=ticky-ticky concurrent -WAY_mt_HC_OPTS=-ticky -concurrent +# Way `s': +WAY_s_NAME=threads (for SMP) +WAY_s_HC_OPTS=-smp # Way `mp': WAY_mp_NAME=parallel WAY_mp_HC_OPTS=-parallel -# # Way `mg': -# WAY_mg_NAME=GranSim WAY_mg_HC_OPTS=-gransim -# -# Ways for different garbage collectors -# -WAY_2s_NAME=2-space GC -WAY_2s_HC_OPTS=-2s - -WAY_1s_NAME=1-space GC -WAY_1s_HC_OPTS=-1s - -WAY_du_NAME=dual-mode GC -WAY_du_HC_OPTS=-du +# Way `dll': +WAY_dll_NAME=Win32 DLLs +WAY_dll_HC_OPTS= # # Add user-way configurations here: