X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=b9466ba63ec63554c3edebc53f457d5491a7a091;hb=604bfdd04c877c6a76139f6f1368349ddf0a8515;hp=1559cd33718221efc9b92d915bc4335d206a9866;hpb=7bac51fa2ad7eb14e31ee65ad992e7e5ab3a4be5;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 1559cd3..b9466ba 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,7 @@ IncludeTestDirsInBuild=NO # HC_ROJEMO_NHC # HC_UNSPECIFIED -WithGhcHc = @WithGhcHc@ +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. @@ -160,30 +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: -# -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=@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 @@ -197,12 +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))) -BuildingProfiling=$(subst p,YES,$(filter p,$(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 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 @@ -215,89 +209,118 @@ 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 -ifeq "$(GhcWithHscBuiltViaC)" "YES" 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 -GhcLibHcOpts=-O -split-objs -odir $* +SplitObjs=YES endif -# Option flags to pass to GHC when it's compiling RTS modules + +# 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. -# GhcRtsCcOpts is used when compiling .c files. +# GhcRtsHcOpts is used when compiling .hc files and .c files. +# GhcRtsCcOpts is used when compiling .c files only. -GhcRtsHcOpts= -GhcRtsCcOpts= +# For a debugging RTS: +# GhcRtsHcOpts = -optc-DDEBUG +# GhcRtsCcOpts = -optc-g -# Build the Haskell Readline bindings? -# -GhcLibsWithReadline=NO +# For an optimised RTS: +GhcRtsHcOpts=-O2 +GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer + +################################################################################ # -# Include path to readline.h -# (no path == in standard include path) +# hslibs project # -ReadlineIncludePath= +################################################################################ -# Build the socket libraries? (ToDo: is this used?) -# -GhcLibsWithSockets=YES +# Build HsLibs for which compiler? -# Strip local symbols from libraries? This can make the libraries smaller, -# but makes debugging somewhat more difficult. Doesn't work with all ld's. +# 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? # -StripLibraries=NO +GhcLibsWithReadline=@HaveReadlineHeaders@ -# Include compiler support for letting the compiler (optionally) report -# your compilation to a central server for generation of fun stats. +# Libraries needed for linking with readline +LibsReadline=@LibsReadline@ + +# Include path to readline.h +# (no path == in standard include path) # -GhcReportCompiles=YES +ReadlineIncludePath= -################################################################################# +################################################################################ # # 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 = -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 @@ -326,11 +349,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 @@ -352,7 +380,6 @@ datadir = @datadir@ #sharedstatedir = @sharedstatedir@ #localstatedir = @localstatedir@ libdir = @libdir@ -infodir = @infodir@ includedir = @includedir@ oldincludedir = @oldincludedir@ mandir = @mandir@ @@ -385,9 +412,6 @@ endif ifeq "$(strip $(libdir))" "" libdir = $(exec_prefix)/lib endif -ifeq "$(strip $(infodir))" "" -infodir = $(prefix)/info -endif ifeq "$(strip $(includedir))" "" includedir = $(prefix)/include endif @@ -399,11 +423,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 @@ -416,11 +440,11 @@ endif # SRC_HC_OPTS += -O -################################################################################# +################################################################################ # # Utilities programs: where to find them # -################################################################################# +################################################################################ #----------------------------------------------------------------------------- # FPtools Utility locations @@ -458,14 +482,10 @@ MKDIRHIER_PREFIX = $(GLAFP_UTILS)/mkdirhier/ LITERATE = $(FPTOOLS_TOP)/literate 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/ -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/ @@ -475,11 +495,27 @@ HSTAGS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hstags/ #----------------------------------------------------------------------------- -# Haskell compiler and mkdependHS +# Haskell compilers and mkdependHS + +# $(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 = $(FPTOOLS_TOP)/ghc/driver/ghc +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 # @@ -525,7 +561,8 @@ CONTEXT_DIFF = @ContextDiffCmd@ CP = cp CPP = @CPP@ CTAGS = $(ETAGS) -RAWCPP = @RAWCPP@ +RAWCPP = $(CPP) -undef -traditional +FIND = @FindCmd@ INSTALL = @INSTALL@ # # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback @@ -562,7 +599,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) @@ -598,10 +635,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 +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 @@ -615,27 +659,23 @@ 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 # -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 @@ -683,7 +723,8 @@ HSTAGS = $(HSTAGS_PREFIX)hstags # # The ways currently defined. # -ALL_WAYS=p t u mp mg 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 mg, @@ -703,7 +744,11 @@ 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 `s': +WAY_s_NAME=threads (for SMP) +WAY_s_HC_OPTS=-smp # Way `mp': WAY_mp_NAME=parallel @@ -713,6 +758,10 @@ WAY_mp_HC_OPTS=-parallel WAY_mg_NAME=GranSim WAY_mg_HC_OPTS=-gransim +# Way `dll': +WAY_dll_NAME=Win32 DLLs +WAY_dll_HC_OPTS= + # # Add user-way configurations here: #