X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=7bd91062fe60d27d88520cf8ad4c71f7ab5e14fb;hb=33939049908879995854acac39c3c85e250d1f9a;hp=d94ba3d99028aa2a43a06e71ce627af48de0e125;hpb=c399df70adc01df586e0bd8fa6e2880fdc643791;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index d94ba3d..7bd9106 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -38,6 +38,56 @@
 # 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
+
+HOSTPLATFORM			= @HostPlatform@
+TARGETPLATFORM			= @TargetPlatform@
+BUILDPLATFORM			= @HostPlatform@
+
+# Hack alert:
+# in one or two places, we need to get at the OS version (major and perhaps even minor),
+# HostOS_Full is the OS name reported by AC_CANONICAL_SYSTEM.
+#
+HostPlatform_CPP		= @HostPlatform_CPP@
+HostArch_CPP			= @HostArch_CPP@
+HostOS_CPP			= @HostOS_CPP@
+HostOS_Full			= @HostOS_Full@
+HostVendor_CPP	                = @HostVendor_CPP@
+
+#
+# ToDo: check if these can be purged now. -- sof
+#
+
+@HostPlatform_CPP@_HOST        = 1
+@HostPlatform_CPP@_TARGET      = 1
+@HostPlatform_CPP@_BUILD       = 1
+
+@HostArch_CPP@_HOST_ARCH       = 1
+@HostArch_CPP@_TARGET_ARCH	= 1
+@HostArch_CPP@_BUILD_ARCH      = 1
+
+@HostOS_CPP@_HOST_OS           = 1
+@HostOS_CPP@_TARGET_OS         = 1
+@HostOS_CPP@_BUILD_OS          = 1
+
+@HostVendor_CPP@_HOST_VENDOR    = 1
+@HostVendor_CPP@_TARGET_VENDOR  = 1
+@HostVendor_CPP@_BUILD_VENDOR   = 1
+
+# Leading underscores on symbol names in object files
+# Valid options: YES/NO
+#
+LeadingUnderscore=@LeadingUnderscore@
+
+# Pin a suffix on executables? If so, what. (cygwin32 only).
+exeext=@exeext@
 
 #################################################################################
 #
@@ -56,18 +106,31 @@
 # 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 = 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
@@ -80,40 +143,32 @@ IncludeTestDirsInBuild=NO
 #
 # Name variables for ghc:
 # 
-GhcProjectName       =The Glorious Glasgow Haskell Compilation System
-GhcProjectNameShort  =ghc
-GhcProjectVersion    =2.02
-GhcProjectPatchLevel =0
-GhcBuildeeVersion    =202
-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
 
@@ -124,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?
@@ -148,15 +210,20 @@ GhcWithRegisterised=YES
 #
 # Target platforms supported:
 #   i386, alpha & sparc
-GhcWithNativeCodeGen=YES
-
-# Build the compiler with the deforester included?
-GhcWithDeforester=NO
+GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha sparc) = x); then echo NO; else echo YES; fi)
 
+#
+# 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)))
 
 #---------------------------------------------------------------
 #
-# Variables that control how the prelude libararies and runtime system are built
+# Variables that control how the prelude libraries and runtime system are built
 
 # What extra ways to build the libraries in
 # In addition to the normal sequential way, the default is to also build
@@ -166,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
 
 #################################################################################
 #
@@ -209,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
 
 #################################################################################
 #
@@ -219,8 +320,6 @@ HsLibHcOpts=$(GhcLibHcOpts)
 #
 #################################################################################
 
-
-
 #################################################################################
 #
 #		green-card project
@@ -229,7 +328,6 @@ HsLibHcOpts=$(GhcLibHcOpts)
 #
 #################################################################################
 
-
 #################################################################################
 #
 #		nofib project
@@ -246,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.
@@ -287,18 +384,58 @@ FPTOOLS_TOP_ABS		= @hardtop@
 prefix                  = @prefix@
 exec_prefix             = @exec_prefix@
 bindir                  = @bindir@
-sbindir                 = @sbindir@
-libexecdir              = @libexecdir@
+#UNUSED, see below: libexecdir              = @libexecdir@
 datadir                 = @datadir@
-sysconfdir              = @datadir@
-sharedstatedir          = @sharedstatedir@
-localstatedir           = @localstatedir@
+#sysconfdir              = @datadir@
+#sharedstatedir          = @sharedstatedir@
+#localstatedir           = @localstatedir@
 libdir                  = @libdir@
 infodir		        = @infodir@
 includedir              = @includedir@
 oldincludedir           = @oldincludedir@
 mandir			= @mandir@
-srcdir                  = @srcdir@
+#UNUSED:srcdir          = @srcdir@
+
+# 
+# Default values for most of the above are only set if
+# they weren't configured to anything in particular
+# via the configure script. (i.e., we make no assumption
+# that the autoconf-generated script will assign defaults
+# to all of the above).
+#
+ifeq "$(strip $(exec_prefix))" ""
+exec_prefix		= $(prefix)
+endif
+ifeq "$(strip $(bindir))" ""
+bindir			= $(exec_prefix)/bin
+endif
+
+#
+# NOTE: by intention, libexecdir and libdir point to 
+# the same place.
+#  => Only way to override this is to set libexecdir= on the command line.
+#     (NOTE: configure script setting is ignored).
+libexecdir		= $(libdir)
+
+ifeq "$(strip $(datadir))" ""
+datadir		= $(prefix)/share
+endif
+ifeq "$(strip $(libdir))" ""
+libdir		= $(exec_prefix)/lib
+endif
+ifeq "$(strip $(infodir))" ""
+infodir		= $(prefix)/info
+endif
+ifeq "$(strip $(includedir))" ""
+includedir	= $(prefix)/include
+endif
+ifeq "$(strip $(oldincludedir))" ""
+oldincludedir	= /usr/include
+endif
+ifeq "$(strip $(mandir))" ""
+mandir		= $(prefix)/man
+endif
+ 
 
 #################################################################################
 #
@@ -319,49 +456,6 @@ srcdir                  = @srcdir@
 
 #################################################################################
 #
-#		Platform
-#
-#################################################################################
-
-# A "platform" is the GNU cpu-type/manufacturer/operating-system target machine
-# specifier.  E.g. sparc-sun-solaris2
-
-HOSTPLATFORM			= @HostPlatform@
-TARGETPLATFORM			= @TargetPlatform@
-BUILDPLATFORM			= @HostPlatform@
-
-HostPlatform_CPP		= @HostPlatform_CPP@
-HostArch_CPP			= @HostArch_CPP@
-HostOS_CPP			= @HostOS_CPP@
-HostVendor_CPP	                = @HostVendor_CPP@
-
-#
-# ToDo: check if these can be purged now. -- sof
-#
-
-@HostPlatform_CPP@_HOST        = 1
-@HostPlatform_CPP@_TARGET      = 1
-@HostPlatform_CPP@_BUILD       = 1
-
-@HostArch_CPP@_HOST_ARCH       = 1
-@HostArch_CPP@_TARGET_ARCH	= 1
-@HostArch_CPP@_BUILD_ARCH      = 1
-
-@HostOS_CPP@_HOST_OS           = 1
-@HostOS_CPP@_TARGET_OS         = 1
-@HostOS_CPP@_BUILD_OS          = 1
-
-@HostVendor_CPP@_HOST_VENDOR    = 1
-@HostVendor_CPP@_TARGET_VENDOR  = 1
-@HostVendor_CPP@_BUILD_VENDOR   = 1
-
-# Leading underscores on symbol names in object files
-# Valid options: YES/NO
-#
-LeadingUnderscore=@LeadingUnderscore@
-
-#################################################################################
-#
 #		Utilities programs: where to find them
 #
 #################################################################################
@@ -380,19 +474,19 @@ LeadingUnderscore=@LeadingUnderscore@
 # 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/
@@ -402,9 +496,13 @@ 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/
@@ -420,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
 #
@@ -443,6 +534,11 @@ endif
 endif
 
 #-----------------------------------------------------------------------------
+# GMP Library
+#
+HaveLibGmp	= @HaveLibGmp@
+
+#-----------------------------------------------------------------------------
 # Flex
 
 FLEX			= @LEX@
@@ -462,11 +558,16 @@ 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
+# install-sh script (if chosen). This not terribly useful to us, so we convert
+# it into an abs. path.
+# 
+INSTALL			:= $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL))
 LATEX			= latex
 LN_S			= @LN_S@
 MANMACROS		= -man
@@ -481,9 +582,38 @@ RANLIB			= @RANLIB@
 RM			= rm -f
 SED			= @SedCmd@
 SHELL			= /bin/sh
+#
+# In emergency situations, REAL_SHELL is used to perform shell commands
+# from within the ghc driver script, by scribbling the command line to
+# a temp file and then having $(REAL_SHELL) execute it. 
+#
+# The reason for having to do this is that overly long command lines
+# cause unnecessary trouble with some shells (e.g., /bin/sh on Solaris
+# 2.5.1), which is why this backdoor is provided. The situation of overly
+# long command lines is either encountered while doing `make boot' in ghc/compiler, 
+# or when linking the compiler binary (`hsc'). 
+#
+# 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
+# it to anything else isn't really portable.
+#
+#  ====> If long command lines cause you trouble, invoke `ghc' (via `make' or otherwise)
+# with REAL_SHELL set to something else than /bin/sh, for instance, your favourite
+# command shell.
+#
+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/.
@@ -499,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
@@ -549,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.