X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=3bffb6ac4f04eed2e746c9eb160166c28dee8a88;hb=50027272414438955dbc41696541cbd25da55883;hp=46ff8a752b79662899f3a8c8c3feb834f3a7be63;hpb=0b19ae9d33bb814b2396f924b9c5c839c3f9dae6;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 46ff8a7..3bffb6a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -97,29 +97,27 @@ exeext=@exeext@
 #
 ################################################################################
 
-#
-# What parts to build: An fptools build tree does not have to be built
-# all in one go. By setting the list of ProjectsToBuild in build.mk you can
-# control which projects are built.
-#
-# Caution: the projects are built in the order given here, so if some
-# projects use others you must list them in the correct order.
-#
-# Generally: 	* glafp-utils should be first
-#		* happy next
-#		* ghc next
-#		then it's up to you
+# BootingFromHc - build GHC and the libraries from .hc files?
+BootingFromHc = @BootingFromHc@
 
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
-# need hslibs/lang first if we're bootstrapping
-ProjectsToBuild   = glafp-utils hslibs ghc
+# 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
 else
-ProjectsToBuild   = glafp-utils happy
+AllProjects = glafp-utils ghc hslibs green-card happy hdirect hood nofib
 endif
+
 #
-# Make a distinction between building and installing
+# (OPTIONAL) set ProjectsToBuild to a list of projects to be built.  If this
+# list is empty, then all projects present in the source tree will be built.
 #
-ProjectsToInstall = glafp-utils happy
+ProjectsToBuild =
+
+#
+# set ProjectsDontInstall to a list of projects which are normally built but
+# not installed.
+#
+ProjectsDontInstall = glafp-utils nofib
 
 #
 # Should the various project tests directories be built?
@@ -161,8 +159,23 @@ GhcCompilerWays=
 #			a pretty strong internal check
 GhcHcOpts=-O -Rghc-timing
 
-# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
-GhcWithHscBuiltViaC=@BootingFromHc@
+# Build a compiler that will build *unregisterised* libraries and
+# binaries by default.  Unregisterised code is supposed to compile and
+# run without any support for architecture-specific assembly mangling,
+# register assignment or tail-calls, and is therefore a good way to get
+# started when porting GHC to new architectures.
+#
+# If this is set to NO, you can still use the unregisterised way
+# (way 'u') to get unregisterised code, but the default way will be
+# registerised.
+#
+# 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)
+# bootstrapping with a compiler that has way 'u' libraries, and the
+# flag '-unreg' is added to GhcHcOpts above.
+#
+GhcUnregisterised=NO
 
 # Build a compiler with a native code generator backend
 # (as well as a C backend)
@@ -175,13 +188,18 @@ else
 GhcWithNativeCodeGen=NO
 endif
 
+HaveLibDL = @HaveLibDL@
+
 # Include GHCi in the compiler.  Default to NO for the time being.
 
-# ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
-# GhcWithInterpreter=YES
-# else 
+ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
+GhcWithInterpreter=YES
+ifeq "$(HaveLibDL)" "YES"
+SRC_HC_OPTS += -ldl
+endif
+else 
 GhcWithInterpreter=NO
-# endif
+endif
 
 #
 # Building various ways?
@@ -189,11 +207,6 @@ GhcWithInterpreter=NO
 BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
 BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
-# Include compiler support for letting the compiler (optionally) report
-# your compilation to a central server for generation of fun stats.
-#
-GhcReportCompiles=NO
-
 #------------------------------------------------------------------------------
 # Options for GHC's Prelude
 
@@ -201,7 +214,7 @@ GhcReportCompiles=NO
 # 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"
+ifeq "$(BootingFromHc)" "YES"
 GhcLibWays=
 else
 GhcLibWays=p
@@ -218,14 +231,18 @@ endif
 GhcLibHcOpts=-O -Rghc-timing
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
-# Don't split object files for libs if we're building DLLs
 DLLized=@EnableWin32DLLs@
+
+# Don't split object files for libs if we're building DLLs, or booting from
+# .hc files.
+SplitObjs=YES
+
 ifeq "$(DLLized)" "YES"
 SplitObjs=NO
-else
-SplitObjs=YES
 endif
-
+ifeq "$(BootingFromHc)" "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.
@@ -282,6 +299,9 @@ LibsReadline=@LibsReadline@
 #
 ReadlineIncludePath=
 
+# Math library
+LIBM=@LIBM@
+
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
@@ -362,7 +382,7 @@ NoFibHcOpts = -O
 ################################################################################
 
 # Directory used by GHC (and possibly other tools) for storing
-# temporary files.  If your /tmp isn't big enough, either override
+# temporary files.  If your TMPDIR isn't big enough, either override
 # this in build.mk or set your environment variable "TMPDIR" to point
 # to somewhere with more space.  (TMPDIR=. is a good choice).
 
@@ -372,10 +392,22 @@ NoFibHcOpts = -O
 # setting the TMPDIR env var would have no effect in the build tree.
 
 DEFAULT_TMPDIR		= /tmp
+ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
+DEFAULT_TMPDIR		= C:/TEMP
+endif
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+DEFAULT_TMPDIR		= C:/TEMP
+endif
 
 # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
 
 FPTOOLS_TOP_ABS		= @hardtop@
+ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
+FPTOOLS_TOP_ABS		= $(subst \,/,$(shell cygpath -w @hardtop@))
+endif
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+FPTOOLS_TOP_ABS		= $(subst \,/,$(shell cygpath -w @hardtop@))
+endif
 
 #
 # Installation directories, we don't use half of these,
@@ -498,10 +530,9 @@ HAPPY_PREFIX    	= $(FPTOOLS_TOP)/happy/src/
 GREENCARD_PREFIX	= $(FPTOOLS_TOP)/green-card/src/
 
 UNLIT_PREFIX    	= $(FPTOOLS_TOP)/ghc/utils/unlit/
-STAT2RESID_PREFIX       = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
 HP2PS_PREFIX            = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
 HSTAGS_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/hstags/
-
+HSC2HS_PREFIX		= $(FPTOOLS_TOP)/ghc/utils/hsc2hs/
 
 #-----------------------------------------------------------------------------
 # Haskell compilers and mkdependHS
@@ -548,6 +579,9 @@ else
 endif
 endif
 
+# default C compiler flags
+SRC_CC_OPTS = -O
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -709,7 +743,7 @@ HAPPY_VERSION		= @HappyVersion@
 #
 # Options to pass to Happy when we're going to compile the output with GHC
 #
-GHC_HAPPY_OPTS		= $(shell if expr $(HAPPY_VERSION) \< "1.8" >/dev/null; then echo -g; else echo -agc; fi)
+GHC_HAPPY_OPTS		= $(shell if ( test `echo $(HAPPY_VERSION) | sed -e "s/\(.*\)\..*/\1/g"` "-gt" "1" || test `echo $(HAPPY_VERSION) | sed -e "s/.*\.\(.*\)/\1/g"` "-ge" "9" ); then echo -agc; else echo -g; fi)
 
 #
 # Stuff from fptools/literate
@@ -725,10 +759,9 @@ LIT2TEXT 		= $(LITERATE_PREFIX)lit2text
 # Stuff from fptools/ghc/utils
 #
 UNLIT	 		= $(UNLIT_PREFIX)unlit$(EXE_SUFFIX)
-STAT2RESID		= $(STAT2RESID_PREFIX)stat2resid
 HP2PS			= $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX)
-HSCPP			= $(HSCPP_PREFIX)hscpp
 HSTAGS			= $(HSTAGS_PREFIX)hstags
+HSC2HS			= $(HSC2HS_PREFIX)hsc2hs-inplace
 
 #
 # Options for the compiling different `ways'. Various projects within