X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=1268da342b29f0f881316c2bc352d8e591887dbb;hb=51cb6efae783acbbd59933a87fd256d26b2f396c;hp=43903735e3010afd03efadd9ad8ca444661eced9;hpb=f5708a1a3db369d5e668dae35843b66b0b5dead3;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 4390373..1268da3 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -97,35 +97,43 @@ 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
+# BootingFromUnregisterisedHc - treat .hc files as containing unregisterised
+# rather than registerised code, i.e., disable the mangler?
+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
 else
-ProjectsToBuild   = glafp-utils ghc hslibs
+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 ghc hslibs
+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?
 #
 IncludeTestDirsInBuild=NO
 
+#
+# Which ways should SGML documents be built?
+# options are: dvi ps pdf html rtf
+#
+SGMLDocWays=
+
 ################################################################################
 #
 #		GHC project
@@ -150,38 +158,68 @@ 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:
-#	-H25m		allocate a bigger heap (might speed up compilation)
-#
-#	-O		compile an optimised compiler
+# Typical options to use here:
 #
-#	-DDEBUG		include consistency/assertion checks in the compiled compiler
+#	-DDEBUG		include debugging code and assertions (will make the
+#			compiler slower and produce debugging output, but useful
+#			for development)
 #
 #	-dcore-lint	check the types after every pass of the compiler;
-#			a pretty strong internal check
-GhcHcOpts=-O -Rghc-timing
+#			a pretty strong internal check of the compiler being
+#			used to compile GHC.  Useful when bootstrapping.
+GhcHcOpts=-Rghc-timing
 
-# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
-GhcWithHscBuiltViaC=@BootingFromHc@
+# Extra Haskell compiler options to use when compiling all Haskell
+# *programs* (not libraries), including GHC itself.
+# Typical options to use here:
+#
+#	-H25m		use a bigger heap (to speed up compilation)
+#
+#	-O		compile an optimised compiler
+#
+FptoolsHcOpts=-O
+
+# 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)
 #
 # Target platforms supported:
-#   i386, alpha & sparc
-ifneq "$(findstring $(HostArch_CPP), i386 alpha sparc)" ""
+#   i386 & sparc
+ifneq "$(findstring $(HostArch_CPP), i386 sparc)" ""
 GhcWithNativeCodeGen=YES
 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), mingw32 linux solaris2 freebsd netbsd openbsd)" ""
+GhcWithInterpreter=YES
+ifeq "$(HaveLibDL)" "YES"
+SRC_HC_OPTS += -ldl
+endif
+else 
 GhcWithInterpreter=NO
-# endif
+endif
 
 #
 # Building various ways?
@@ -189,11 +227,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 +234,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 +251,32 @@ 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@
+
+# Win32 only: are we building a compiler that tries to reduce external
+# dependencies? i.e., one that doesn't assume that the user has got
+# the cygwin toolchain installed on his/her Win32 box.
+#
+# GHC is still dependent on GNU tools in the backend (gcc to further process
+# .c/.hc/.s/.o files + 'perl' to mangle and split), but using this
+# option a GHC distribution can be put together which includes a minimal
+# set of these open source tools. 
+#
+MinimalUnixDeps=@MinimalUnixDeps@
+
+# 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
+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.
@@ -241,11 +292,11 @@ StripLibraries=NO
 
 # For a debugging RTS:
 # GhcRtsHcOpts = -optc-DDEBUG
-# GhcRtsCcOpts = -optc-g
+# GhcRtsCcOpts = -g
 
 # For an optimised RTS:
 GhcRtsHcOpts=-O2
-GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer
+GhcRtsCcOpts=-O2 -fomit-frame-pointer
 
 # Include the front panel code?  Needs GTK+.
 GhcRtsWithFrontPanel = NO
@@ -267,9 +318,6 @@ HsLibsFor	= ghc
 # hslibs for GHC also uses the following variables (defined above):
 #   GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, DLLized, StripLibraries
 
-# Haskell compiler options for tools in hslibs
-GhcLibToolsHcOpts=-O
-
 # Build the Haskell Readline bindings?
 #
 GhcLibsWithReadline=@HaveReadlineHeaders@
@@ -282,10 +330,16 @@ LibsReadline=@LibsReadline@
 #
 ReadlineIncludePath=
 
+# Math library
+LIBM=@LIBM@
+
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
 
+X_CFLAGS=@X_CFLAGS@
+X_LIBS=@X_LIBS@
+
 ################################################################################
 #
 #		happy project
@@ -362,7 +416,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 +426,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.
 
+ifeq "$(findstring $(TARGETPLATFORM), i386-unknown-cygwin32 i386-unknown-mingw32)" ""
 FPTOOLS_TOP_ABS		= @hardtop@
+else
+FPTOOLS_TOP_ABS		= $(subst \,/,$(shell cygpath -w @hardtop@))
+endif
+# Keep the Unix-style path to use with Unix tools (e.g. in ghc-inplace script)
+FPTOOLS_TOP_ABS_UNIX    = @hardtop@
 
 #
 # Installation directories, we don't use half of these,
@@ -386,6 +452,7 @@ prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
 datadir			= @datadir@
+
 #sysconfdir		= @datadir@
 #sharedstatedir		= @sharedstatedir@
 #localstatedir		= @localstatedir@
@@ -394,10 +461,16 @@ includedir		= @includedir@
 oldincludedir		= @oldincludedir@
 mandir			= @mandir@
 
-#UNUSED, see below: libexecdir              = @libexecdir@
 #UNUSED:infodir		= @infodir@
 #UNUSED:srcdir          = @srcdir@
 
+#
+# override libdir and datadir to put project-specific stuff in
+# a subdirectory with the version number included.
+#
+libdir     := $(if $(ProjectNameShort),$(libdir)/$(ProjectNameShort)-$(ProjectVersion),$(libdir))
+datadir    := $(if $(ProjectNameShort),$(datadir)/$(ProjectNameShort)-$(ProjectVersion),$(datadir))
+
 # 
 # Default values for most of the above are only set if
 # they weren't configured to anything in particular
@@ -452,6 +525,21 @@ endif
 #
 #	SRC_HC_OPTS += -O
 
+# These flags make flex 8-bit
+SRC_FLEX_OPTS	+= -8
+
+SRC_INSTALL_BIN_OPTS	+= -s
+
+# lint gets all CPP's flags too
+SRC_LINT_OPTS		+= -axz -DLINT $(SRC_CPP_OPTS)
+WAY$(_way)_LINT_OPTS	+= WAY$(_way)_CPP_OPTS
+
+# Default fptools options for dllwrap.
+SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32
+
+# Flags for CPP when running GreenCard on .pgc files
+GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
+
 
 ################################################################################
 #
@@ -535,7 +623,10 @@ GHC_INPLACE 	= $(FPTOOLS_TOP)/ghc/compiler/ghc-inplace
 #-----------------------------------------------------------------------------
 # C compiler
 #
-#
+# NB. Don't override $(WhatGccIsCalled) using build.mk,  re-configure using
+# the flag --with-gcc=<blah> instead.  The reason is that the configure script
+# needs to know which gcc you're using in order to perform its tests.
+
 HaveGcc 	= @HaveGcc@
 UseGcc  	= YES
 WhatGccIsCalled = @WhatGccIsCalled@
@@ -547,6 +638,9 @@ else
 endif
 endif
 
+# default C compiler flags
+SRC_CC_OPTS = @SRC_CC_OPTS@
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -577,6 +671,7 @@ FLEX_LIB		=
 # Other standard (ha!) Unix utilities
 
 AR			= @ArCmd@
+ArSupportsInput		= @ArSupportsInput@
 # Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
 BASH                    = /usr/local/bin/bash
 #
@@ -587,9 +682,13 @@ COMPRESS_SUFFIX         = @CompressSuffix@
 
 CONTEXT_DIFF		= @ContextDiffCmd@
 CP			= cp
-CPP			= @CPP@
+CPP			= @CPP@ @CPPFLAGS@
 CTAGS 			= $(ETAGS)
-RAWCPP                  = $(CPP) -undef -traditional
+#
+# RAWCPP_FLAGS are the flags to give to cpp (viz, gcc -E) to persuade it to
+# behave plausibly on Haskell sources.
+#
+RAWCPP_FLAGS            = -undef -traditional
 FIND			= @FindCmd@
 INSTALL			= @INSTALL@
 #
@@ -601,6 +700,7 @@ INSTALL			:= $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL))
 LATEX			= latex
 HEVEA			= hevea
 HACHA			= hacha
+LD			= ld
 LN_S			= @LN_S@
 MANMACROS		= -man
 MSMACROS 		= -ms
@@ -679,6 +779,7 @@ SRC_SGML2DVI_OPTS       = -d $(SGMLSTYLESHEET)
 SRC_SGML2HTML_OPTS      = -d $(SGMLSTYLESHEET)
 SRC_SGML2PS_OPTS      	= -d $(SGMLSTYLESHEET)
 SRC_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
+SRC_SGML2PDF_OPTS       = -d $(SGMLSTYLESHEET)
 
 DOCBOOK_CATALOG		= @Catalog@
 
@@ -701,6 +802,12 @@ GREENCARD	        = $(FPTOOLS_TOP)/green-card/src/green-card
 BLD_DLL			= dllwrap
 
 #
+# .NET support software
+#
+ILX2IL                  = ilx2il
+ILASM                   = ilasm
+
+#
 # Happy
 #
 HAPPY			= @HappyCmd@
@@ -708,7 +815,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
@@ -765,7 +872,7 @@ HSC2HS			= $(HSC2HS_PREFIX)hsc2hs-inplace
 # The ways currently defined.
 #
 ALL_WAYS=p t u s mp mg a b c d e f g h i j k l m n o A B
-USER_WAYS=a b c d e f g h i j k l m n o A B
+USER_WAYS=a b c d e f g h j k l m n o A B
 
 #
 # The following ways currently have treated specially, p u t mg,
@@ -775,6 +882,10 @@ USER_WAYS=a b c d e f g h i j k l m n o A B
 # 
 # If you want to add to these default options, fill in the variables below:
 
+# Way 'i':
+WAY_i_NAME=ILX
+WAY_i_HC_OPTS= -filx -fruntime-types
+
 # Way 'p':
 WAY_p_NAME=profiling
 WAY_p_HC_OPTS= -prof
@@ -832,9 +943,6 @@ WAY_g_HC_OPTS=
 WAY_h_NAME=
 WAY_h_HC_OPTS=
 
-WAY_i_NAME=
-WAY_i_HC_OPTS=
-
 WAY_j_NAME=
 WAY_j_HC_OPTS=
 
@@ -852,3 +960,23 @@ WAY_n_HC_OPTS=
 
 WAY_o_NAME=
 WAY_o_HC_OPTS=
+
+################################################################################
+#
+#		31-bit-Int Core files
+#
+################################################################################
+
+# 
+# It is possible to configure the compiler and prelude to support 31-bit
+# integers, suitable for a back-end and RTS using a tag bit on a 32-bit
+# architecture.  Currently the only useful output from this option is external Core
+# files.  The following additions to your build.mk will produce the
+# 31-bit core output.  Note that this is *not* just a library "way"; the
+# compiler must be built a special way too.
+
+# GhcCppOpts +=-DWORD_SIZE_IN_BITS=31
+# GhcLibHcOpts +=-fext-core -fno-code -DWORD_SIZE_IN_BITS=31
+# GhcLibCppOpts += -DWORD_SIZE_IN_BITS=31
+# SplitObjs=NO
+