X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=75a45107110dbfe8e8d76fa304f78d806e09a3b2;hb=b25b5efde7b06657ed76ecfcbb639ae8a04b45e2;hp=6fd2b476aac1cfa6b28794993b4e40d141c13e44;hpb=19aeaaf9eee41619f14d413a7f29957c6c355b9a;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 6fd2b47..75a4510 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,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 @@ -89,13 +89,13 @@ 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 @@ -110,25 +110,25 @@ exeext=@exeext@ # * ghc next # then it's up to you -ProjectsToBuild = glafp-utils ghc +ProjectsToBuild = glafp-utils ghc hslibs # # Make a distinction between building and installing # -ProjectsToInstall = glafp-utils ghc +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). # -################################################################################# +################################################################################ #--------------------------------------------------------------- # @@ -147,7 +147,11 @@ IncludeTestDirsInBuild=NO # HC_ROJEMO_NHC # HC_UNSPECIFIED -WithGhcHc = ghc-2.10 +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) @@ -156,11 +160,9 @@ 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 # @@ -171,15 +173,8 @@ GhcHcOpts= # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files? GhcWithHscBuiltViaC=@BootingFromHc@ -# 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). +# (unregisterised used for Hugs at the moment) GhcWithRegisterised=YES # Build a compiler with a native code generator backend @@ -193,14 +188,15 @@ GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha s # 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 @@ -219,75 +215,101 @@ endif # -O is pretty desirable, otherwise no inlining of prelude # things (incl "+") happens when compiling with this compiler -ifeq "$(GhcWithHscBuiltViaC)" "YES" GhcLibHcOpts=-O -else -GhcLibHcOpts=-O -split-objs -odir $* -endif - -# Build the Haskell Readline bindings? -# -GhcLibsWithReadline=NO -# -# Include path to readline.h -# (no path == in standard include path) -# -ReadlineIncludePath= +SplitObjs = YES -# Build the socket libraries? (ToDo: is this used?) +# Win32 only: Enable the RTS and libraries to be built as DLLs # -GhcLibsWithSockets=YES +EnableWin32DLLs=@EnableWin32DLLs@ # 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 -# Include compiler support for letting the compiler (optionally) report -# your compilation to a central server for generation of fun stats. +# ---------------------------------------------------------------------------- +# 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 + +################################################################################ # -GhcReportCompiles=YES +# 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, EnableWin32DLLs, StripLibraries -################################################################################# +# Build the Haskell Readline bindings? +# +GhcLibsWithReadline=NO +# +# Include path to readline.h +# (no path == in standard include path) +# +ReadlineIncludePath= +HaveLibReadline=@HaveLibReadline@ + +################################################################################ # # happy project # # Happy specific options # -################################################################################# +################################################################################ # 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 = +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 @@ -316,11 +338,16 @@ NoFibHcOpts = -O # # ============================================================================== -################################################################################# +################################################################################ # # 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 @@ -389,11 +416,11 @@ 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 @@ -406,11 +433,11 @@ endif # SRC_HC_OPTS += -O -################################################################################# +################################################################################ # # Utilities programs: where to find them # -################################################################################# +################################################################################ #----------------------------------------------------------------------------- # FPtools Utility locations @@ -454,8 +481,6 @@ TEXI2HTML_PREFIX = $(LITERATE_PREFIX)texi2html/ HAPPY_PREFIX = $(FPTOOLS_TOP)/happy/src/ GREENCARD_PREFIX = $(FPTOOLS_TOP)/green-card/src/ -RTS_PREFIX = $(FPTOOLS_TOP)/common-rts/ - UNLIT_PREFIX = $(FPTOOLS_TOP)/ghc/utils/unlit/ UGEN_PREFIX = $(FPTOOLS_TOP)/ghc/utils/ugen/ STAT2RESID_PREFIX = $(FPTOOLS_TOP)/ghc/utils/stat2resid/ @@ -465,18 +490,34 @@ 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) +# 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 # # HaveGcc = @HaveGcc@ UseGcc = YES -WhatGccIsCalled = gcc +WhatGccIsCalled = @WhatGccIsCalled@ ifeq "$(strip $(HaveGcc))" "YES" ifneq "$(strip $(UseGcc))" "YES" CC = cc @@ -486,7 +527,7 @@ endif endif #----------------------------------------------------------------------------- -# GMP Library +# GMP Library (version 2.0.x or above) # HaveLibGmp = @HaveLibGmp@ LibGmp = @LibGmp@ @@ -495,7 +536,9 @@ 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 @@ -513,7 +556,7 @@ CONTEXT_DIFF = @ContextDiffCmd@ CP = cp CPP = @CPP@ CTAGS = $(ETAGS) -RAWCPP = @RAWCPP@ +RAWCPP = $(CPP) -undef -traditional INSTALL = @INSTALL@ # # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback @@ -550,7 +593,7 @@ SHELL = /bin/sh # 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 +# 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) @@ -586,10 +629,17 @@ YACC = @YaccCmd@ #----------------------------------------------------------------------------- # SGML stuff (currently not configured - we assume you have it) -SGML2LATEX = sgml2latex -SGML2HTML = sgml2html -SGML2INFO = sgml2info -SGML2TXT = sgml2txt +SGML2DVI = db2dvi +SGML2HTML = db2html +SGML2INFO = db2info +SGML2RTF = db2rtf + +SGMLSTYLESHEET = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl + +SRC_SGML2DVI_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2HTML_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2INFO_OPTS = -d $(SGMLSTYLESHEET) +SRC_SGML2RTF_OPTS = -d $(SGMLSTYLESHEET) #----------------------------------------------------------------------------- # FPtools support software @@ -603,13 +653,14 @@ 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 = $(FPTOOLS_TOP)/green-card/src/green-card +BLD_DLL = dllwrap + # # Stuff from fptools/literate # @@ -671,60 +722,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 `mc': concurrent -WAY_mc_NAME=concurrent -WAY_mc_HC_OPTS=-concurrent +WAY_u_HC_OPTS=-unreg -# 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: