X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=mk%2Fconfig.mk.in;h=ea61013ad8f1c0dd755f63c38d1c5f26d169eb81;hb=57d15e1c1b85a8ec417e843827e5c8d271f7b1da;hp=a0eb257cd6f8b2187b678fc2b92a9bff73da5325;hpb=af27ab5c3bb6e0ef5d4f618a4f1b99e72060b424;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a0eb257..ea61013 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -128,6 +128,12 @@ ProjectsDontInstall = glafp-utils nofib
 #
 IncludeTestDirsInBuild=NO
 
+#
+# Which ways should SGML documents be built?
+# options are: dvi ps pdf html rtf
+#
+SGMLDocWays=
+
 ################################################################################
 #
 #		GHC project
@@ -152,16 +158,26 @@ 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
+
+# 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
@@ -192,6 +208,9 @@ else
 GhcWithNativeCodeGen=NO
 endif
 
+# Include support for generating Java
+GhcWithJavaGen=NO
+
 HaveLibDL = @HaveLibDL@
 
 # Include GHCi in the compiler.  Default to NO for the time being.
@@ -302,9 +321,6 @@ HsLibsFor	= ghc
 # hslibs for GHC also uses the following variables (defined above):
 #   GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, DLLized, StripLibraries
 
-# Haskell compiler options for tools in fptools
-FptoolsHcOpts=-O
-
 # Build the Haskell Readline bindings?
 #
 GhcLibsWithReadline=@HaveReadlineHeaders@
@@ -420,15 +436,10 @@ 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: the top of the fptools hierarchy, absolute path. (POSIX / unix-style path).
 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@
+# The platform specific version of 'hardtop'.
+FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 
 #
 # Installation directories, we don't use half of these,
@@ -438,12 +449,16 @@ FPTOOLS_TOP_ABS_UNIX    = @hardtop@
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
-datadir			= @datadir@
+datadir0		= @datadir@
 
 #sysconfdir		= @datadir@
 #sharedstatedir		= @sharedstatedir@
 #localstatedir		= @localstatedir@
-libdir			= @libdir@
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+libdir0			= @libdir@
+else
+libdir0                 = @prefix@
+endif
 includedir		= @includedir@
 oldincludedir		= @oldincludedir@
 mandir			= @mandir@
@@ -455,8 +470,13 @@ mandir			= @mandir@
 # 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))
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+libdir     = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
+datadir    = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
+else
+libdir	   = $(libdir0)
+datadir    = $(datadir0)
+endif
 
 # 
 # Default values for most of the above are only set if
@@ -594,6 +614,8 @@ GhcVersion	= @GhcVersion@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 GhcPatchLevel	= @GhcPatchLevel@
+# Canonicalised ghc version number, used for easy (integer) version comparisons.
+GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
 
 HBC		= @HBC@
 NHC		= @NHC@
@@ -669,7 +691,7 @@ COMPRESS_SUFFIX         = @CompressSuffix@
 
 CONTEXT_DIFF		= @ContextDiffCmd@
 CP			= cp
-CPP			= @CPP@
+CPP			= @CPP@ @CPPFLAGS@
 CTAGS 			= $(ETAGS)
 #
 # RAWCPP_FLAGS are the flags to give to cpp (viz, gcc -E) to persuade it to
@@ -700,6 +722,13 @@ RANLIB			= @RANLIB@
 RM			= rm -f
 SED			= @SedCmd@
 SHELL			= /bin/sh
+
+# Some ld's support the -x flag and some don't, so the configure
+# script detects which we have and sets LdXFlag to "-x" or ""
+# respectively.
+LD			= @LdCmd@
+LD_X			= @LdXFlag@
+
 #
 # In emergency situations, REAL_SHELL is used to perform shell commands
 # from within the ghc driver script, by scribbling the command line to
@@ -788,6 +817,12 @@ GREENCARD	        = $(FPTOOLS_TOP)/green-card/src/green-card
 BLD_DLL			= dllwrap
 
 #
+# .NET support software
+#
+ILX2IL                  = ilx2il
+ILASM                   = ilasm
+
+#
 # Happy
 #
 HAPPY			= @HappyCmd@
@@ -795,7 +830,7 @@ HAPPY_VERSION		= @HappyVersion@
 #
 # Options to pass to Happy when we're going to compile the output with GHC
 #
-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)
+GHC_HAPPY_OPTS		= @HappyOpts@
 
 #
 # Stuff from fptools/literate
@@ -852,7 +887,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,
@@ -862,6 +897,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
@@ -919,9 +958,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=
 
@@ -939,3 +975,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
+