X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=7bd91062fe60d27d88520cf8ad4c71f7ab5e14fb;hb=33939049908879995854acac39c3c85e250d1f9a;hp=9dd60e8e4e15f11eeb6b5773aa1411cbeff81a52;hpb=0dca79e743c52fea8e2133645a7d1f8106f51199;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 9dd60e8..7bd9106 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -86,6 +86,8 @@ HostVendor_CPP = @HostVendor_CPP@ # LeadingUnderscore=@LeadingUnderscore@ +# Pin a suffix on executables? If so, what. (cygwin32 only). +exeext=@exeext@ ################################################################################# # @@ -104,23 +106,31 @@ LeadingUnderscore=@LeadingUnderscore@ # 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 # -# 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 +ProjectsToInstall = glafp-utils ghc # # Should the various project tests directories be built? # IncludeTestDirsInBuild=NO +# +# Name variables for the main project +# +Project = Ghc +ProjectName = $($(Project)ProjectName) +ProjectNameShort = $($(Project)ProjectNameShort) +ProjectVersion = $($(Project)ProjectVersion) +ProjectVersionInt = $($(Project)ProjectVersionInt) +ProjectPatchLevel = $($(Project)ProjectPatchLevel) + ################################################################################# # # GHC project @@ -133,40 +143,32 @@ IncludeTestDirsInBuild=NO # # Name variables for ghc: # -GhcProjectName =The Glorious Glasgow Haskell Compilation System -GhcProjectNameShort =ghc -GhcProjectVersion =2.04 -GhcProjectPatchLevel =0 -GhcBuildeeVersion =204 -GhcBuilderVersion =29 - -# -# Name variables for the fptools, for now equal to the above -# ghc stuff -# -ProjectName =$(GhcProjectName) -ProjectNameShort =$(GhcProjectNameShort) -ProjectVersion =$(GhcProjectVersion) -ProjectPatchLevel =$(GhcProjectPatchLevel) +# *ProjectVersion is treated as a *string* +# *ProjectVersionInt is treated as an *integer* (for cpp defines) +GhcProjectName = The Glorious Glasgow Haskell Compilation System +GhcProjectNameShort = ghc +GhcProjectVersion = 3.02 +GhcProjectVersionInt = 302 +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: +# +# 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 + +WithGhcHc = ghc-2.10 + # Unused, we think # WithGhcHcType=HC_GLASGOW_GHC @@ -177,9 +179,16 @@ 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 (default is 6m) +# +# -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 -# -fshow-import-specs show import specialisations +# +# -dcore-lint check the types after every pass of the compiler; +# a pretty strong internal check GhcHcOpts= # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files? @@ -203,9 +212,6 @@ GhcWithRegisterised=YES # i386, alpha & sparc GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha sparc) = x); then echo NO; else echo YES; fi) -# Build the compiler with the deforester included? -GhcWithDeforester=NO - # # Building various ways? # (right now, empty if not). @@ -227,40 +233,52 @@ GhcLibWays=p # 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 -################################################################################# # -# hslibs project +# Splitting profiled code produces awfully large archives under ELF, so +# we turn it off here. # -# Set of (configurable) options needed by the Haskell libraries (hslibs) -# plus their default options (if any). +# ToDo: track down the source of this. # -################################################################################# +ifeq "$(strip $(way))" "p" +GhcLibHcOpts= -O +else +ifeq "$(strip $(way))" "mr" +GhcLibHcOpts= -O +else +ifeq "$(GhcWithHscBuiltViaC)" "NO" +GhcLibHcOpts= -O -split-objs -odir $* +else +#NB: .hc files need to distributed in *unsplit* form. +GhcLibHcOpts= -O +endif +endif +endif # Build the Haskell Readline bindings? # -HsLibsWithReadline=NO +GhcLibsWithReadline=NO # # Include path to readline.h # (no path == in standard include path) # ReadlineIncludePath= -# Build the socket libraries? +# Build the socket libraries? (ToDo: is this used?) # -HsLibsWithSockets=YES +GhcLibsWithSockets=YES -# -# The different ways to build hslibs. Default is just to mirror -# what is done for the ghc prelude libraries. -# -HsLibWays=$(GhcLibWays) +# what to include in a binary distribution -# Option flags for hslibs are by default the same as for the options -# used for the prelude libs (see above). -HsLibHcOpts=$(GhcLibHcOpts) +GhcMainDir = ghc +GhcBinDistDirs = ghc +GhcBinDistDocs = docs ghc/docs/users_guide ghc/docs/libraries +GhcBinDistPrlScripts = ghc-$(GhcProjectVersion) stat2resid hstags mkdependHS +GhcBinDistLibPrlScripts = hscpp +GhcBinDistBins = hp2ps ################################################################################# # @@ -270,7 +288,29 @@ HsLibHcOpts=$(GhcLibHcOpts) # ################################################################################# +# +# Name variables for happy: +# +HappyProjectName = Happy +HappyProjectNameShort = happy +HappyProjectVersion = 1.5 +HappyProjectVersionInt = 15 +HappyProjectPatchLevel = 0 + +# The compiler you'd like to use to compile Happy +WithHappyHc = $(WithGhcHc) + +# 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 +HappyMainDir = happy +HappyBinDistDirs = happy +HappyBinDistDocs = happy/doc +HappyBinDistShScripts = happy ################################################################################# # @@ -280,8 +320,6 @@ HsLibHcOpts=$(GhcLibHcOpts) # ################################################################################# - - ################################################################################# # # green-card project @@ -290,7 +328,6 @@ HsLibHcOpts=$(GhcLibHcOpts) # ################################################################################# - ################################################################################# # # nofib project @@ -307,10 +344,9 @@ 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. @@ -438,19 +474,19 @@ 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/ 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/ @@ -464,6 +500,9 @@ 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/ @@ -479,13 +518,6 @@ HSTAGS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hstags/ HC = $(FPTOOLS_TOP)/ghc/driver/ghc 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 - #----------------------------------------------------------------------------- # C compiler # @@ -502,6 +534,11 @@ endif endif #----------------------------------------------------------------------------- +# GMP Library +# +HaveLibGmp = @HaveLibGmp@ + +#----------------------------------------------------------------------------- # Flex FLEX = @LEX@ @@ -521,10 +558,9 @@ COMPRESS_SUFFIX = @CompressSuffix@ CONTEXT_DIFF = @ContextDiffCmd@ CP = cp -CPP = @RAWCPP@ +CPP = @CPP@ CTAGS = $(ETAGS) RAWCPP = @RAWCPP@ -GNUCPP = @GNUCPP@ INSTALL = @INSTALL@ # # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback @@ -572,6 +608,12 @@ REAL_SHELL=$(SHELL) SIZE = size STRIP = strip TAR = @TarCmd@ + +# +# 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/. @@ -587,26 +629,32 @@ TROFF = troff UNAME = uname YACC = @YaccCmd@ +#----------------------------------------------------------------------------- +# SGML stuff (currently not configured - we assume you have it) + +SGML2LATEX = sgml2latex +SGML2HTML = sgml2html +SGML2INFO = sgml2info +SGML2TXT = sgml2txt #----------------------------------------------------------------------------- # 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 +SGML2LATEX = sgml2latex RUNTEST = $(RUNTEST_PREFIX)runstdtest HAPPY = @HappyCmd@ +HAPPY_VERSION = @HappyVersion@ LX = @LxCmd@ - -ifeq "$(HAPPY)" "" -HAPPY = $(HAPPY_PREFIX)happy -endif +GREENCARD = $(FPTOOLS_TOP)/green-card/src/green-card # # Stuff from fptools/literate @@ -637,7 +685,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.