X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=66d44ed622a80e7ef4509f72d55570de619faf25;hb=4740cf56c774b92e02d31b4666158d70c2e85a8f;hp=638791b656fab4fb633ca1d2e99d312f1661e656;hpb=124690e9ad1111c4e73ba63b9d991fd014c8f645;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 638791b..66d44ed 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -3,33 +3,26 @@
 #
 ################################################################################
 #
-#			config.mk.in-template
+# config.mk.in
 #
-#	This file defines all the variables that set the configuration of
-#	a particular build.
+# This file supplies defaults for many tweakable build configuration
+# options.  Some of the defaults are filled in by the autoconf-generated
+# configure script.
 #
+# DO NOT EDIT THIS FILE!
 #
-################################################################################
-
-# The configuration is defined in two steps:
-#
-#	1. The builder (i.e. the person doing the build)
-#	   copies this file, config.mk.in-template
-#	   to config.mk.in
-#
-#	2. S/he then edits it manually (gasp) to reflect any configuration
-#	   options s/he wants.
+# 	- config.mk is auto-generated from config.mk.in by configure.
+#	  This may be triggered automatically by the build system (say
+#	  if config.mk.in has changed more recently than config.mk),
+#	  so if you edit config.mk your changes will be spammed.
 #
-#	3. Then s/he runs "configure", which generates config.mk from
-#	   config.mk.in, substituting for system/platform-dependent things
-#	   enclosed in @at-signs@.
+#	- Settings in this file may be overriden by giving replacement
+#	  definitions in build.mk.  If you don't have a build.mk file
+#	  then you get defaults for everything.  The defaults should
+#	  provide a reasonable vanilla build.
 #
 # This is one of only two files that configure generates (the other is config.h)
 #
-# Note that after subsequent edits of config.mk.in for a build, the configure script
-# will have to be re-run manually to have the change reflected in config.mk. 
-#
-
 # There is a section below for each project within the fptools suite
 #
 #	PLUS
@@ -106,9 +99,9 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 
 # build the libs first if we're bootstrapping from .hc files
 ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils hslibs ghc green-card happy hdirect hood nofib
+AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib
 else
-AllProjects = glafp-utils ghc hslibs green-card happy hdirect hood nofib
+AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib
 endif
 
 #
@@ -191,7 +184,7 @@ FptoolsHcOpts=-O
 #
 # NOTE: this is not the same as building the compiler itself
 # unregisterised.  That's done by either (a) bootstrapping with a
-# compiler that was built with GhcUnregisterized=YES, or (b)
+# compiler that was built with GhcUnregisterised=YES, or (b)
 # bootstrapping with a compiler that has way 'u' libraries, and the
 # flag '-unreg' is added to GhcHcOpts above.
 #
@@ -212,6 +205,8 @@ endif
 GhcWithJavaGen=NO
 
 HaveLibDL = @HaveLibDL@
+HaveRtldNext = @HaveRtldNext@
+HaveRtldLocal = @HaveRtldLocal@
 
 # Include GHCi in the compiler.  Default to NO for the time being.
 
@@ -243,10 +238,10 @@ else
 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
+# Option flags to pass to GHC when it's compiling modules in
+# fptools/libraries.  Typically these are things like -O or
+# -dcore-lint or -H32m.  The ones that are *essential* are wired into
+# the build system.
 #
 # 	-O is pretty desirable, otherwise no inlining of prelude
 #		things (incl "+") happens when compiling with this compiler
@@ -299,28 +294,28 @@ StripLibraries=NO
 
 # For an optimised RTS:
 GhcRtsHcOpts=-O2
-GhcRtsCcOpts=-O2 -fomit-frame-pointer
+GhcRtsCcOpts=-fomit-frame-pointer
 
 # Include the front panel code?  Needs GTK+.
 GhcRtsWithFrontPanel = NO
 
+#
+# To have the RTS support interoperation with OS threads, set
+# GhcRtsThreaded to YES (preferably via the --enable-threaded-rts
+# configure script option). The consequence of this is spelled out
+# in details elsewhere, but, briefly, Concurrent Haskell threads
+# can now make external (i.e., C) calls without blocking the progress
+# of other CH threads. Multiple native threads can also execute
+# Haskell code without getting in each others way too.
+# 
+GhcRtsThreaded=@ThreadedRts@
+
 ################################################################################
 #
-#		hslibs project
+# libraries project
 #
 ################################################################################
 
-# Build HsLibs for which compiler?  
-
-# 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, DLLized, StripLibraries
-
 # Build the Haskell Readline bindings?
 #
 GhcLibsWithReadline=@HaveReadlineHeaders@
@@ -339,6 +334,8 @@ LIBM=@LIBM@
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
+GL_CFLAGS=@GL_CFLAGS@
+GL_LIBS=@GL_LIBS@
 
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
@@ -436,10 +433,10 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 DEFAULT_TMPDIR		= C:/TEMP
 endif
 
-# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. (platform-specific format).
-FPTOOLS_TOP_ABS		= @hardtop_plat@
-# Keep the Unix-style path to use with Unix tools (e.g. in ghc-inplace script)
-FPTOOLS_TOP_ABS_UNIX    = @hardtop@
+# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. (POSIX / unix-style path).
+FPTOOLS_TOP_ABS		= @hardtop@
+# The platform specific version of 'hardtop'.
+FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 
 #
 # Installation directories, we don't use half of these,
@@ -657,10 +654,11 @@ HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
-# Regex library 
+# Regex libraries
 # (if present in libc use that one, otherwise use the one in the tree)
 #
-HaveRegex	= @HaveRegex@
+HavePosixRegex  = @HavePosixRegex@
+HaveGNURegex	= @HaveGNURegex@
 
 #-----------------------------------------------------------------------------
 # GTK+