X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=40f5fd1453e2199a4529dde4f84ba0c75a009e30;hb=e99733ffee71d1f3737f3ea39a31e9449f51be94;hp=840e6ffa35ffc928c0f3923c596d8e40074c36e9;hpb=39c84a7df1a17472e9c4edc6d0ad8c3e5e21376a;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 840e6ff..40f5fd1 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -100,6 +100,10 @@ exeext=@exeext@
 # BootingFromHc - build GHC and the libraries from .hc files?
 BootingFromHc = @BootingFromHc@
 
+# 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
@@ -298,8 +302,8 @@ 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
+# Haskell compiler options for tools in fptools
+FptoolsHcOpts=-O
 
 # Build the Haskell Readline bindings?
 #
@@ -435,6 +439,7 @@ prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
 datadir			= @datadir@
+
 #sysconfdir		= @datadir@
 #sharedstatedir		= @sharedstatedir@
 #localstatedir		= @localstatedir@
@@ -443,10 +448,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
@@ -599,7 +610,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@
@@ -612,10 +626,7 @@ endif
 endif
 
 # default C compiler flags
-SRC_CC_OPTS = -O
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_CC_OPTS += -mno-cygwin -mwin32
-endif
+SRC_CC_OPTS = @SRC_CC_OPTS@
 
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
@@ -647,6 +658,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
 #
@@ -659,7 +671,11 @@ CONTEXT_DIFF		= @ContextDiffCmd@
 CP			= cp
 CPP			= @CPP@
 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@
 #