X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=8ee3b5bde975110b7f0cd8e983856dcf666b28b5;hb=826c063a11b42243702dc78e148cf3b8d297ed58;hp=2f98dc816e80590c54a51035dcd234422f2cddfe;hpb=bf1f9dbb0ff699f4893d2757cce36f86c21a6ac6;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 2f98dc8..8ee3b5b 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -1,7 +1,7 @@ -# +# -*-makefile-*- # @configure_input@ # -################################################################################# +################################################################################ # # config.mk.in-template # @@ -9,7 +9,7 @@ # a particular build. # # -################################################################################# +################################################################################ # The configuration is defined in two steps: # @@ -38,11 +38,11 @@ # 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 @@ -86,16 +86,16 @@ HostVendor_CPP = @HostVendor_CPP@ # LeadingUnderscore=@LeadingUnderscore@ -# Pin a suffix on executables? If so, what. (cygwin32 only). -exeext= +# Pin a suffix on executables? If so, what (Windows 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 @@ -106,15 +106,18 @@ exeext= # 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 +ifeq "$(GhcWithHscBuiltViaC)" "YES" +# need hslibs/lang first if we're bootstrapping +ProjectsToBuild = glafp-utils hslibs ghc +else +ProjectsToBuild = glafp-utils ghc hslibs +endif # -# Make a distinction between building and installing, ProjectsToInstall -# does not include the literate bits.. +# Make a distinction between building and installing # ProjectsToInstall = glafp-utils ghc hslibs @@ -123,56 +126,23 @@ ProjectsToInstall = glafp-utils ghc hslibs # IncludeTestDirsInBuild=NO -# -# Name variables for the main project -# -Project = Ghc -ProjectName = $($(Project)ProjectName) -ProjectNameShort = $($(Project)ProjectNameShort) -ProjectVersion = $($(Project)ProjectVersion) -ProjectPatchLevel = $($(Project)ProjectPatchLevel) - -################################################################################# +################################################################################ # # 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.10 -GhcProjectPatchLevel = 0 +################################################################################ #--------------------------------------------------------------- # # 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: -# 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 +# The compiler used to build GHC is $(GHC). To change the actual compiler +# used, re-configure with --with-ghc=. # 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) @@ -181,172 +151,181 @@ 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: -# -H25m allocate a bigger heap (default is 6m) +# -H25m allocate a bigger heap (might speed up compilation) # # -O compile an optimised compiler -# NB! If you add -O you'll almost certainly need to increase -# the amount of heap space too (to 15m or more) # # -DDEBUG include consistency/assertion checks in the compiled compiler # # -dcore-lint check the types after every pass of the compiler; # a pretty strong internal check -GhcHcOpts= +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 - -# Build a registerised version of hsc and runtime -# (you'd be desperate or silly not to). -GhcWithRegisterised=YES +GhcWithHscBuiltViaC=@BootingFromHc@ # Build a compiler with a native code generator backend # (as well as a C backend) # # Target platforms supported: # i386, alpha & sparc -GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha sparc) = x); then echo NO; else echo YES; fi) +ifneq "$(findstring $(HostArch_CPP), i386 alpha sparc)" "" +GhcWithNativeCodeGen=YES +else +GhcWithNativeCodeGen=NO +endif + +# Include GHCi in the compiler +ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" "" +GhcWithInterpreter=YES +else +GhcWithInterpreter=NO +endif # # Building various ways? # (right now, empty if not). BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS))) -BuildingConcurrent=$(subst mc,YES,$(filter mc,$(WAYS))) -BuildingProfiling=$(subst p,YES,$(filter p,$(WAYS))) BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS))) -BuildingProfilingConcurrent=$(subst mr,YES,$(filter mr,$(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 libraries 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 +# *and* standard library modules (std) *and* modules in hslibs # Typically these are things like -O or -dcore-lint # The ones that are *essential* are wired into ghc/lib/Makefile # # -O is pretty desirable, otherwise no inlining of prelude # things (incl "+") happens when compiling with this compiler -# -# Splitting profiled code produces awfully large archives under ELF, so -# we turn it off here. -# -# ToDo: track down the source of this. -# -ifneq "$(strip $(way))" "p" -GhcLibHcOpts= -O -split-objs -odir $* +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 +DLLized=@EnableWin32DLLs@ +ifeq "$(DLLized)" "YES" +SplitObjs=NO else -GhcLibHcOpts= -O +SplitObjs=YES endif -# what to include in a binary distribution -GhcMainDir = ghc -GhcBinDistDirs = ghc hslibs -GhcBinDistDocs = docs ghc/docs/users_guide -GhcBinDistPrlScripts = ghc stat2resid hstags mkdependHS -GhcBinDistLibPrlScripts = hscpp +# Strip local symbols from libraries? This can make the libraries smaller, +# but makes debugging somewhat more difficult. Doesn't work with all ld's. +# +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 -################################################################################# +# Include the front panel code? Needs GTK+. +GhcRtsWithFrontPanel = NO + +################################################################################ # # hslibs project # -# Set of (configurable) options needed by the Haskell libraries (hslibs) -# plus their default options (if any). -# -################################################################################# +################################################################################ + +# 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, DLLized, 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? +# Build the Haskell OpenGL/GLUT binding? # -HsLibsWithSockets=YES +GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@ -# -# 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 # -################################################################################# - -# -# Name variables for happy: -# -HappyProjectName = Happy -HappyProjectNameShort = happy -HappyProjectVersion = 1.5 -HappyProjectPatchLevel = 0 +################################################################################ # The compiler you'd like to use to compile Happy -WithHappyHc = $(WithGhcHc) +WithHappyHc = @WithHc@ # HappyHcOpts gives the flags to pass to the Haskell compiler used # to compile the Happy sources with. # -HappyHcOpts = - -# what to include in a binary distribution +HappyHcOpts = -O -HappyMainDir = happy -HappyBinDistDirs = happy -HappyBinDistDocs = happy/doc -HappyBinDistShScripts = happy - -################################################################################# +################################################################################ # # 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 @@ -355,18 +334,17 @@ HappyBinDistShScripts = happy # 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 # ============================================================================== # @@ -376,13 +354,23 @@ 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). + +# DEFAULT_TMPDIR isn't called TMPDIR because GNU make tends to +# override an environment variable with the value of the make variable +# of the same name (if it exists) when executing sub-processes, so +# setting the TMPDIR env var would have no effect in the build tree. -TMPDIR = /tmp +DEFAULT_TMPDIR = /tmp # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. @@ -393,19 +381,20 @@ FPTOOLS_TOP_ABS = @hardtop@ # but since the configure script has them on offer while # passing through, we might as well set them. -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -#UNUSED, see below: libexecdir = @libexecdir@ -datadir = @datadir@ -#sysconfdir = @datadir@ -#sharedstatedir = @sharedstatedir@ -#localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = @oldincludedir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +datadir = @datadir@ +#sysconfdir = @datadir@ +#sharedstatedir = @sharedstatedir@ +#localstatedir = @localstatedir@ +libdir = @libdir@ +includedir = @includedir@ +oldincludedir = @oldincludedir@ mandir = @mandir@ + +#UNUSED, see below: libexecdir = @libexecdir@ +#UNUSED:infodir = @infodir@ #UNUSED:srcdir = @srcdir@ # @@ -435,9 +424,6 @@ endif ifeq "$(strip $(libdir))" "" libdir = $(exec_prefix)/lib endif -ifeq "$(strip $(infodir))" "" -infodir = $(prefix)/info -endif ifeq "$(strip $(includedir))" "" includedir = $(prefix)/include endif @@ -447,13 +433,13 @@ 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 @@ -466,11 +452,11 @@ endif # SRC_HC_OPTS += -O -################################################################################# +################################################################################ # # Utilities programs: where to find them # -################################################################################# +################################################################################ #----------------------------------------------------------------------------- # FPtools Utility locations @@ -486,15 +472,14 @@ endif # 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/ @@ -504,37 +489,48 @@ ETAGS_PREFIX = $(GLAFP_UTILS)/etags/ MSUB_PREFIX = $(GLAFP_UTILS)/msub/ LNDIR_PREFIX = $(GLAFP_UTILS)/lndir/ MKDIRHIER_PREFIX = $(GLAFP_UTILS)/mkdirhier/ - -# Still used? -LITERATE = $(FPTOOLS_TOP)/literate +DOCBOOK_PREFIX = $(GLAFP_UTILS)/docbook/ LITERATE_PREFIX = $(FPTOOLS_TOP)/literate/ -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/ STAT2RESID_PREFIX = $(FPTOOLS_TOP)/ghc/utils/stat2resid/ HP2PS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hp2ps/ -HSCPP_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hscpp/ HSTAGS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hstags/ #----------------------------------------------------------------------------- -# Haskell compiler and mkdependHS - -HC = $(FPTOOLS_TOP)/ghc/driver/ghc -MKDEPENDHS = $(HC) +# Haskell compilers and mkdependHS +# $(GHC), $(HBC) and $(NHC) point to installed versions of the relevant +# compilers, if available. # -# The compiler proper is built with the 1.2 compiler, -# so when building the dependencies, we need mkdependHS -# for the 1.2 compiler. +# $(HC) is a generic Haskell 98 compiler, set to $(GHC) by default. +# $(MKDEPENDHS) is the Haskell dependency generator (ghc -M). # -MKDEPENDHS_1_2 = mkdependHS-1.2 +# NOTE: Don't override $(GHC) in build.mk, use configure --with-ghc instead +# (because the version numbers have to be calculated). + +GHC = @WithGhc@ +GhcVersion = @GhcVersion@ +GhcMajVersion = @GhcMajVersion@ +GhcMinVersion = @GhcMinVersion@ +GhcPatchLevel = @GhcPatchLevel@ + +HBC = @HBC@ +NHC = @NHC@ + +HC = @WithHc@ +MKDEPENDHS = $(HC) + +# 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/compiler/ghc-inplace #----------------------------------------------------------------------------- # C compiler @@ -542,7 +538,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 @@ -552,10 +548,30 @@ endif endif #----------------------------------------------------------------------------- +# GMP Library (version 2.0.x or above) +# +HaveLibGmp = @HaveLibGmp@ +LibGmp = @LibGmp@ + +#----------------------------------------------------------------------------- +# Regex library +# (if present in libc use that one, otherwise use the one in the tree) +# +HaveRegex = @HaveRegex@ + +#----------------------------------------------------------------------------- +# GTK+ + +GTK_CONFIG = @GTK_CONFIG@ +GTK_VERSION = @GTK_VERSION@ + +#----------------------------------------------------------------------------- # 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 @@ -571,10 +587,10 @@ 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 @@ -583,6 +599,8 @@ INSTALL = @INSTALL@ # INSTALL := $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL)) LATEX = latex +HEVEA = hevea +HACHA = hacha LN_S = @LN_S@ MANMACROS = -man MSMACROS = -ms @@ -610,8 +628,8 @@ SHELL = /bin/sh # 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 SHELL that will show up the bogosity in the first place, but setting +# By default, REAL_SHELL is set equal to 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) @@ -622,11 +640,12 @@ REAL_SHELL=$(SHELL) SIZE = size STRIP = strip TAR = @TarCmd@ +ZIP = zip # -# Under cygwin32, we have to deal with .exe suffixes +# Under Windows, we have to deal with .exe suffixes # -EXE_SUFFIX=@ExeSuffix@ +EXE_SUFFIX=@exeext@ # # This is special to literate/, ToDo: add literate-specific @@ -644,19 +663,30 @@ UNAME = uname YACC = @YaccCmd@ #----------------------------------------------------------------------------- -# SGML stuff (currently not configured - we assume you have it) +# SGML stuff + +JADE = @JadeCmd@ + +SGML2DVI = $(DOCBOOK_PREFIX)db2dvi +SGML2HTML = $(DOCBOOK_PREFIX)db2html +SGML2PS = $(DOCBOOK_PREFIX)db2ps +SGML2PDF = $(DOCBOOK_PREFIX)db2pdf +SGML2RTF = $(DOCBOOK_PREFIX)db2rtf + +SGMLSTYLESHEET = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl -SGML2LATEX = sgml2latex -SGML2HTML = sgml2html -SGML2INFO = sgml2info -SGML2TXT = sgml2txt +SRC_SGML2DVI_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2HTML_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2PS_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2RTF_OPTS = -d $(SGMLSTYLESHEET) + +DOCBOOK_CATALOG = @Catalog@ #----------------------------------------------------------------------------- # 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 @@ -664,39 +694,38 @@ MSUB = $(MSUB_PREFIX)msub ETAGS = $(ETAGS_PREFIX)etags VERBATIM = $(VERBATIM_PREFIX)verbatim SGMLVERB = $(SGMLVERB_PREFIX)sgmlverb -SGML2LATEX = sgml2latex RUNTEST = $(RUNTEST_PREFIX)runstdtest -HAPPY = @HappyCmd@ -HAPPY_VERSION = @HappyVersion@ LX = @LxCmd@ -GREENCARD = @GreencardCmd@ +GREENCARD = $(FPTOOLS_TOP)/green-card/src/green-card -ifeq "$(HAPPY)" "" -HAPPY = $(HAPPY_PREFIX)happy -endif +BLD_DLL = dllwrap + +# +# Happy +# +HAPPY = @HappyCmd@ +HAPPY_VERSION = @HappyVersion@ +# +# Options to pass to Happy when we're going to compile the output with GHC +# +GHC_HAPPY_OPTS = $(shell if expr $(HAPPY_VERSION) \< "1.8" >/dev/null; then echo -g; else echo -agc; fi) # # Stuff from fptools/literate # -INFO = $(UTIL_PREFIX)info -MAKEINFO = $(INFO_PREFIX)makeinfo -POSTMAKEINFO = $(INFO_PREFIX)postmakeinfo LIT2PGM = $(LITERATE_PREFIX)lit2pgm -LIT2TEXI = $(LITERATE_PREFIX)lit2texi LIT2HTML = $(LITERATE_PREFIX)lit2html LIT2LATEX = $(LITERATE_PREFIX)lit2latex MKDEPENDLIT = $(LITERATE_PREFIX)mkdependlit LIT2CHANGELOG = $(LITERATE_PREFIX)lit2changelog LIT2TEXT = $(LITERATE_PREFIX)lit2text -TEXI2HTML = $(TEXI2HTML_PREFIX)texi2html # # Stuff from fptools/ghc/utils # -UNLIT = $(UNLIT_PREFIX)unlit -UGEN = $(UGEN_PREFIX)ugen +UNLIT = $(UNLIT_PREFIX)unlit$(EXE_SUFFIX) STAT2RESID = $(STAT2RESID_PREFIX)stat2resid -HP2PS = $(HP2PS_PREFIX)hp2ps +HP2PS = $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX) HSCPP = $(HSCPP_PREFIX)hscpp HSTAGS = $(HSTAGS_PREFIX)hstags @@ -704,7 +733,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. @@ -736,62 +765,42 @@ 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 - -# # Add user-way configurations here: # WAY_A_NAME=