X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=2a2982110487f1df6946770f5009c23cdf6ca0e0;hb=c6bed6debe26cc4225ac0db0ff625dd55bc9f9e1;hp=2f98dc816e80590c54a51035dcd234422f2cddfe;hpb=bf1f9dbb0ff699f4893d2757cce36f86c21a6ac6;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 2f98dc8..2a29821 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 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?
@@ -130,6 +128,7 @@ Project		  = Ghc
 ProjectName       = $($(Project)ProjectName)
 ProjectNameShort  = $($(Project)ProjectNameShort)
 ProjectVersion    = $($(Project)ProjectVersion)
+ProjectVersionInt = $($(Project)ProjectVersionInt)
 ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 
 #################################################################################
@@ -144,9 +143,13 @@ ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 #
 # Name variables for ghc:
 # 
+# *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      = 2.10
+GhcProjectVersion = proto-3.02-6-May
+GhcProjectVersionInt   = 302
 GhcProjectPatchLevel   = 0
 
 #---------------------------------------------------------------
@@ -157,10 +160,6 @@ GhcProjectPatchLevel   = 0
 #
 #   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
@@ -168,8 +167,7 @@ GhcProjectPatchLevel   = 0
 #		       	     HC_ROJEMO_NHC
 #		       	     HC_UNSPECIFIED
 
-WithGhcHc = ghc-0.29
-Ghc2_0=NO
+WithGhcHc = ghc-2.10
 
 # Unused, we think
 # WithGhcHcType=HC_GLASGOW_GHC
@@ -194,7 +192,7 @@ GhcCompilerWays=
 GhcHcOpts=
 
 # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
-GhcWithHscBuiltViaC=NO
+GhcWithHscBuiltViaC=@BootingFromHc@
 
 # Build hsc with -O and turn optimising flag on when compiling
 # the intermediate C file
@@ -230,7 +228,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
@@ -245,51 +248,46 @@ GhcLibWays=p
 #
 # ToDo: track down the source of this.
 #
-ifneq "$(strip $(way))" "p"
-GhcLibHcOpts= -O -split-objs -odir $*
-else
+ifeq "$(strip $(way))" "p"
 GhcLibHcOpts= -O
+else 
+ifeq "$(strip $(way))" "mr"
+GhcLibHcOpts= -O
+else
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+GhcLibHcOpts=-O
+else
+GhcLibHcOpts=-O -split-objs -odir $*
+endif
+endif
 endif
-
-# what to include in a binary distribution
-
-GhcMainDir = ghc
-GhcBinDistDirs = ghc hslibs
-GhcBinDistDocs = docs ghc/docs/users_guide
-GhcBinDistPrlScripts = ghc stat2resid hstags mkdependHS
-GhcBinDistLibPrlScripts = hscpp
-
-#################################################################################
-#
-#		hslibs project
-#
-# 	Set of (configurable) options needed by the Haskell libraries (hslibs)
-# 	plus their default options (if any).
-#
-#################################################################################
 
 # 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
 
+# Strip local symbols from libraries?  This can make the libraries smaller,
+# but makes debugging somewhat more difficult.  Doesn't work with all ld's.
 #
-# The different ways to build hslibs. Default is just to mirror
-# what is done for the ghc prelude libraries.
-#
-HsLibWays=$(GhcLibWays)
+StripLibraries=NO
 
-# Option flags for hslibs are by default the same as for the options
-# used for the prelude libs (see above).
-HsLibHcOpts=$(GhcLibHcOpts)
+# what to include in a binary distribution
+
+GhcMainDir = ghc
+GhcBinDistDirs = ghc
+GhcBinDistDocs = docs ghc/docs/users_guide ghc/docs/libraries
+GhcBinDistPrlScripts = ghc-$(GhcProjectVersion) stat2resid hstags mkdependHS
+GhcBinDistLibPrlScripts = hscpp
+GhcBinDistBins = hp2ps
 
 #################################################################################
 #
@@ -305,6 +303,7 @@ HsLibHcOpts=$(GhcLibHcOpts)
 HappyProjectName       = Happy
 HappyProjectNameShort  = happy
 HappyProjectVersion    = 1.5
+HappyProjectVersionInt = 15
 HappyProjectPatchLevel = 0
 
 # The compiler you'd like to use to compile Happy
@@ -338,7 +337,6 @@ HappyBinDistShScripts = happy
 #
 #################################################################################
 
-
 #################################################################################
 #
 #		nofib project
@@ -355,18 +353,17 @@ HappyBinDistShScripts = happy
 #	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
 
 # ==============================================================================
 #
@@ -486,15 +483,14 @@ 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/
@@ -515,6 +511,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/
@@ -529,13 +527,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
 #
@@ -552,6 +543,11 @@ endif
 endif
 
 #-----------------------------------------------------------------------------
+# GMP Library
+#
+HaveLibGmp	= @HaveLibGmp@
+
+#-----------------------------------------------------------------------------
 # Flex
 
 FLEX			= @LEX@
@@ -571,10 +567,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
@@ -656,7 +651,6 @@ SGML2TXT		= sgml2txt
 
 # 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
@@ -669,11 +663,7 @@ RUNTEST			= $(RUNTEST_PREFIX)runstdtest
 HAPPY			= @HappyCmd@
 HAPPY_VERSION		= @HappyVersion@		
 LX			= @LxCmd@
-GREENCARD		= @GreencardCmd@
-
-ifeq "$(HAPPY)" ""
-HAPPY			= $(HAPPY_PREFIX)happy
-endif
+GREENCARD	        = $(FPTOOLS_TOP)/green-card/src/green-card
 
 #
 # Stuff from fptools/literate
@@ -704,7 +694,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.