X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=722aad2d26d590caf407ebb7c4a096e39a86fabf;hb=62a6dd852deb4efd4ac99b8e8c5a9b0355e9e9df;hp=7267ee5ab47ff6f1587db32c91522d5763f526d2;hpb=75a29f03c98f376a6cbf9a18dd7aac32eea4072b;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 7267ee5..722aad2 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -87,7 +87,7 @@ HostVendor_CPP = @HostVendor_CPP@ LeadingUnderscore=@LeadingUnderscore@ # Pin a suffix on executables? If so, what. (cygwin32 only). -exeext= +exeext=@exeext@ ################################################################################# # @@ -106,17 +106,15 @@ 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 happy 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 happy ghc hslibs +ProjectsToInstall = glafp-utils ghc # # Should the various project tests directories be built? @@ -132,44 +130,16 @@ IncludeTestDirsInBuild=NO # ################################################################################# -# -# Name variables for ghc: -# -GhcProjectName = The Glorious Glasgow Haskell Compilation System -GhcProjectNameShort = ghc -GhcProjectVersion = 2.09 -GhcProjectPatchLevel = 0 - -# -# Name variables for happy: -# -HappyProjectName = Happy -HappyProjectNameShort = happy -HappyProjectVersion = 1.4 -HappyProjectPatchLevel = 0 - -# -# 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: # HC_CHALMERS_HBC @@ -177,11 +147,11 @@ ProjectPatchLevel =$(GhcProjectPatchLevel) # HC_ROJEMO_NHC # HC_UNSPECIFIED -WithGhcHc = ghc-0.29 -Ghc2_0=NO +WithGhcHc = @WithGhcHc@ -# Unused, we think -# WithGhcHcType=HC_GLASGOW_GHC +# 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) @@ -203,17 +173,10 @@ GhcCompilerWays= GhcHcOpts= # 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 @@ -227,10 +190,7 @@ 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))) #--------------------------------------------------------------- # @@ -239,7 +199,12 @@ BuildingProfilingConcurrent=$(subst mr,YES,$(filter mr,$(WAYS))) # 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 @@ -248,50 +213,42 @@ GhcLibWays=p # -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 $* +ifeq "$(GhcWithHscBuiltViaC)" "YES" +GhcLibHcOpts=-O else -GhcLibHcOpts= -O +GhcLibHcOpts=-O -split-objs -odir $* endif +# Option flags to pass to GHC when it's compiling RTS modules +# 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. -################################################################################# -# -# hslibs project -# -# Set of (configurable) options needed by the Haskell libraries (hslibs) -# plus their default options (if any). -# -################################################################################# +GhcRtsHcOpts=-O2 +GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer # 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? +# Strip local symbols from libraries? This can make the libraries smaller, +# but makes debugging somewhat more difficult. Doesn't work with all ld's. # -HsLibsWithSockets=YES +StripLibraries=NO +# Include compiler support for letting the compiler (optionally) report +# your compilation to a central server for generation of fun stats. # -# The different ways to build hslibs. Default is just to mirror -# what is done for the ghc prelude libraries. -# -HsLibWays=$(GhcLibWays) +GhcReportCompiles=NO -# Option flags for hslibs are by default the same as for the options -# used for the prelude libs (see above). -HsLibHcOpts=$(GhcLibHcOpts) +# Win32 only: Enable the RTS and libraries to be built as DLLs +# +EnableWin32DLLs=@EnableWin32DLLs@ ################################################################################# # @@ -307,8 +264,7 @@ WithHappyHc = $(WithGhcHc) # HappyHcOpts gives the flags to pass to the Haskell compiler used # to compile the Happy sources with. # -HappyHcOpts = - +HappyHcOpts = -O ################################################################################# # @@ -318,8 +274,6 @@ HappyHcOpts = # ################################################################################# - - ################################################################################# # # green-card project @@ -328,7 +282,6 @@ HappyHcOpts = # ################################################################################# - ################################################################################# # # nofib project @@ -345,18 +298,17 @@ HappyHcOpts = # 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 # ============================================================================== # @@ -476,19 +428,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/ @@ -504,6 +456,8 @@ 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/ @@ -518,20 +472,13 @@ 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 # # HaveGcc = @HaveGcc@ UseGcc = YES -WhatGccIsCalled = gcc +WhatGccIsCalled = @WhatGccIsCalled@ ifeq "$(strip $(HaveGcc))" "YES" ifneq "$(strip $(UseGcc))" "YES" CC = cc @@ -541,10 +488,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 @@ -560,10 +515,9 @@ COMPRESS_SUFFIX = @CompressSuffix@ CONTEXT_DIFF = @ContextDiffCmd@ CP = cp -CPP = @RAWCPP@ +CPP = @CPP@ CTAGS = $(ETAGS) -RAWCPP = @RAWCPP@ -GNUCPP = @GNUCPP@ +RAWCPP = $(CPP) -undef -traditional INSTALL = @INSTALL@ # # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback @@ -600,7 +554,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) @@ -611,6 +565,7 @@ REAL_SHELL=$(SHELL) SIZE = size STRIP = strip TAR = @TarCmd@ +ZIP = zip # # Under cygwin32, we have to deal with .exe suffixes @@ -632,28 +587,34 @@ 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@ -GREENCARD = @GreencardCmd@ +GREENCARD = $(FPTOOLS_TOP)/green-card/src/green-card -ifeq "$(HAPPY)" "" -HAPPY = $(HAPPY_PREFIX)happy -endif +BLD_DLL = dllwrap # # Stuff from fptools/literate @@ -684,7 +645,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. @@ -716,60 +677,39 @@ 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 mp mg 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 `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_u_HC_OPTS=-unreg # 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: