X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ef0c4795fb8db0683bfb40fd8c7f6e436434b1cb;hb=3f149d7293f5ce37c8211d8d51ea3665e077272f;hp=e5581cc6afdbe148ecb62fd381fb213f1745f878;hpb=57e4541e9922a49b01aee93a7468526e21cd6bf6;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index e5581cc..ef0c479 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -257,9 +257,11 @@ GhcWithJavaGen=NO
 
 HaveLibDL = @HaveLibDL@
 
-ArchSupportsSMP=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc)))
+# ArchSupportsSMP should be set iff there is support for that arch in
+# includes/SMP.h
+ArchSupportsSMP=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc powerpc)))
 
-ifeq "$(ArchSupportsSMP)" "YES"
+ifeq "$(ArchSupportsSMP)$(GhcUnregisterised)" "YESNO"
 GhcWithSMP=YES
 else
 GhcWithSMP=NO
@@ -277,6 +279,17 @@ else
 GhcWithInterpreter=NO
 endif
 
+# GhcEnableTablesNextToCode tells us whether the target architecture
+# supports placing info tables directly before the entry code
+# (see TABLES_NEXT_TO_CODE in the RTS).  Whether we actually compile for
+# TABLES_NEXT_TO_CODE depends on whether we're building unregisterised
+# code or not, which may be decided by options to the compiler later.
+ifneq "$(findstring $(TargetArch_CPP)X, ia64X powerpc64X)" ""
+GhcEnableTablesNextToCode=NO
+else
+GhcEnableTablesNextToCode=YES
+endif
+
 #
 # Building various ways?
 # (right now, empty if not).
@@ -302,6 +315,9 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
 HscIfaceFileVersion=6
 
+# Building with debugger?
+GhciWithDebugger=YES
+
 #------------------------------------------------------------------------------
 # Options for Libraries
 
@@ -355,6 +371,15 @@ DLLized=@EnableWin32DLLs@
 #
 StripLibraries=NO
 
+# These are the URL patterns that Haddock uses to generate the "Source
+# File" links on each page.
+CorePackageSourceURL = http://darcs.haskell.org/ghc-6.6/packages/$(PACKAGE)/%{FILE}
+ExtraPackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE}
+
+# These are the packages required to be present in order to bootstrap GHC
+# NB. must be synced with libraries/core-packages
+CorePackages = base Cabal haskell98 readline regex-base regex-compat \
+	       regex-posix parsec stm template-haskell unix Win32
 
 # ----------------------------------------------------------------------------
 # Object-file splitting
@@ -411,6 +436,11 @@ GhcRtsCcOpts=-fomit-frame-pointer
 # Include the front panel code?  Needs GTK+.
 GhcRtsWithFrontPanel = NO
 
+# Include support for CPU performance counters via the PAPI library in the RTS?
+# (PAPI: http://icl.cs.utk.edu/papi/)
+GhcRtsWithPapi = NO
+HavePapi = @HavePapi@
+
 ################################################################################
 #
 #		nofib
@@ -461,10 +491,10 @@ NoFibRuns = 5
 
 DEFAULT_TMPDIR		= /tmp
 ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
-DEFAULT_TMPDIR		= C:/TEMP
+DEFAULT_TMPDIR		= /C/TEMP
 endif
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-DEFAULT_TMPDIR		= C:/TEMP
+DEFAULT_TMPDIR		= /C/TEMP
 endif
 
 # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. (POSIX / unix-style path).
@@ -478,6 +508,7 @@ FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 # passing through, we might as well set them.
 
 prefix			= @prefix@
+datarootdir		= @datarootdir@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
 datadir0		= @datadir@
@@ -489,7 +520,7 @@ mandir			= @mandir@
 ifeq "$(Windows)" "YES"
 
 ifeq "$(strip $(prefix))" ""
-prefix		= c:/ghc
+prefix		= /c/ghc
 endif
 
 # Hack: our directory layouts tend to be different on Windows, so
@@ -570,6 +601,7 @@ INSTALL_PROGRAM = $(INSTALL) -m 755
 INSTALL_SCRIPT  = $(INSTALL) -m 755
 INSTALL_SHLIB   = $(INSTALL) -m 755
 INSTALL_DATA    = $(INSTALL) -m 644
+INSTALL_MAN     = $(INSTALL) -m 644
 INSTALL_DIR     = $(MKDIRHIER)
 
 # -----------------------------------------------------------------------------
@@ -703,6 +735,7 @@ GHC_SPLIT_DIR_ABS	= $(FPTOOLS_TOP_ABS)/$(GHC_SPLIT_DIR_REL)
 #      xxx		the executable relative to the current dir
 
 GHC_UNLIT_PGM		= unlit$(exeext)
+GHC_HP2PS_PGM		= hp2ps
 GHC_HSTAGS_PGM		= hasktags
 GHC_HSC2HS_INPLACE_PGM	= hsc2hs-inplace
 GHC_TOUCHY_PGM		= touchy$(exeext)
@@ -727,6 +760,7 @@ GHC_PERL		= $(PERL)
 endif
 
 UNLIT			= $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM)
+HP2PS			= $(GHC_HP2PS_DIR)/$(GHC_HP2PS_PGM)
 HSTAGS			= $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM)
 HSC2HS_INPLACE		= $(GHC_HSC2HS_DIR)/$(GHC_HSC2HS_INPLACE_PGM)
 MANGLER			= $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM)