X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=7cae94a6c4d01f77f7bea677e67e3d885d60288c;hb=2e5a06c0dbb68263be966050c34e5b1479bd93ac;hp=ea61013ad8f1c0dd755f63c38d1c5f26d169eb81;hpb=5b4f91d4a1bc1320f4f548213cc2a5d253c468d1;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index ea61013..7cae94a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -3,33 +3,28 @@
 #
 ################################################################################
 #
-#			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
+# 	- 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.
 #
-#	2. S/he then edits it manually (gasp) to reflect any configuration
-#	   options s/he wants.
+#	- Settings in this file may be overriden by giving replacement
+#	  definitions in build.mk.  See build.mk.sample for a good
+#	  starting point for a build.mk file.
 #
-#	3. Then s/he runs "configure", which generates config.mk from
-#	   config.mk.in, substituting for system/platform-dependent things
-#	   enclosed in @at-signs@.
+#	  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 +101,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 haddock
 else
-AllProjects = glafp-utils ghc hslibs green-card happy hdirect hood nofib
+AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib haddock
 endif
 
 #
@@ -191,7 +186,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,10 +207,12 @@ endif
 GhcWithJavaGen=NO
 
 HaveLibDL = @HaveLibDL@
+HaveRtldNext = @HaveRtldNext@
+HaveRtldLocal = @HaveRtldLocal@
 
 # Include GHCi in the compiler.  Default to NO for the time being.
 
-ifneq "$(findstring $(HostOS_CPP), mingw32 linux solaris2 freebsd netbsd openbsd)" ""
+ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd netbsd openbsd)" ""
 GhcWithInterpreter=YES
 ifeq "$(HaveLibDL)" "YES"
 SRC_HC_OPTS += -ldl
@@ -231,7 +228,7 @@ BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
 BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
 #------------------------------------------------------------------------------
-# Options for GHC's Prelude
+# Options for Libraries
 
 # What extra ways to build the libraries in
 # In addition to the normal sequential way, the default is to also build
@@ -243,10 +240,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
@@ -267,6 +264,21 @@ DLLized=@EnableWin32DLLs@
 #
 MinimalUnixDeps=@MinimalUnixDeps@
 
+# Strip local symbols from libraries?  This can make the libraries smaller,
+# but makes debugging somewhat more difficult.  Doesn't work with all ld's.
+#
+StripLibraries=NO
+
+
+# ----------------------------------------------------------------------------
+# Object-file splitting
+#
+# 	Set SplitObjs=YES or NO in your build.mk
+#
+#	Don't use -split-objs in in GhcLibHcOpts, because the build
+#		system needs to do other special magic if you are
+#		doing object-file splitting
+
 # Don't split object files for libs if we're building DLLs, or booting from
 # .hc files.
 SplitObjs=YES
@@ -280,11 +292,9 @@ endif
 ifeq "$(GhcUnregisterised)" "YES"
 SplitObjs=NO
 endif
-
-# Strip local symbols from libraries?  This can make the libraries smaller,
-# but makes debugging somewhat more difficult.  Doesn't work with all ld's.
-#
-StripLibraries=NO
+ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
+SplitObjs=NO
+endif
 
 # ----------------------------------------------------------------------------
 # Options for GHC's RTS
@@ -299,28 +309,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@
@@ -336,9 +346,15 @@ ReadlineIncludePath=
 # Math library
 LIBM=@LIBM@
 
+# Build the ObjectIO ?
+#
+GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
+
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
+GL_CFLAGS=@GL_CFLAGS@
+GL_LIBS=@GL_LIBS@
 
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
@@ -478,6 +494,10 @@ libdir	   = $(libdir0)
 datadir    = $(datadir0)
 endif
 
+# Default place for putting interface files is $(libdir)
+# (overriden for packages in package.mk)
+ifacedir   = $(libdir)
+
 # 
 # Default values for most of the above are only set if
 # they weren't configured to anything in particular
@@ -587,10 +607,9 @@ LNDIR_PREFIX		= $(GLAFP_UTILS)/lndir/
 MKDIRHIER_PREFIX	= $(GLAFP_UTILS)/mkdirhier/
 DOCBOOK_PREFIX		= $(GLAFP_UTILS)/docbook/
 
-LITERATE_PREFIX    	= $(FPTOOLS_TOP)/literate/
+HADDOCK_PREFIX		= $(FPTOOLS_TOP)/haddock/
 
-HAPPY_PREFIX    	= $(FPTOOLS_TOP)/happy/src/
-GREENCARD_PREFIX	= $(FPTOOLS_TOP)/green-card/src/
+LITERATE_PREFIX    	= $(FPTOOLS_TOP)/literate/
 
 UNLIT_PREFIX    	= $(FPTOOLS_TOP)/ghc/utils/unlit/
 HP2PS_PREFIX            = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
@@ -650,6 +669,10 @@ endif
 # default C compiler flags
 SRC_CC_OPTS = @SRC_CC_OPTS@
 
+ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
+SRC_CC_OPTS += -G0
+endif
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -657,10 +680,16 @@ HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
-# Regex library 
+# Mingwex Library
+#
+HaveLibMingwEx	= @HaveLibMingwEx@
+
+#-----------------------------------------------------------------------------
+# Regex libraries
 # (if present in libc use that one, otherwise use the one in the tree)
 #
-HaveRegex	= @HaveRegex@
+HavePosixRegex  = @HavePosixRegex@
+HaveGNURegex	= @HaveGNURegex@
 
 #-----------------------------------------------------------------------------
 # GTK+
@@ -830,7 +859,13 @@ HAPPY_VERSION		= @HappyVersion@
 #
 # Options to pass to Happy when we're going to compile the output with GHC
 #
-GHC_HAPPY_OPTS		= @HappyOpts@
+GHC_HAPPY_OPTS		= -agc
+
+#
+# Haddock
+# 
+HADDOCK			= @HaddockCmd@
+HADDOCK_INPLACE		= $(HADDOCK_PREFIX)/src/haddock-inplace
 
 #
 # Stuff from fptools/literate