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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 0149515..ef0c479 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -257,7 +257,9 @@ 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)$(GhcUnregisterised)" "YESNO"
 GhcWithSMP=YES
@@ -282,7 +284,7 @@ endif
 # (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), ia64 powerpc64)" ""
+ifneq "$(findstring $(TargetArch_CPP)X, ia64X powerpc64X)" ""
 GhcEnableTablesNextToCode=NO
 else
 GhcEnableTablesNextToCode=YES
@@ -313,6 +315,9 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
 HscIfaceFileVersion=6
 
+# Building with debugger?
+GhciWithDebugger=YES
+
 #------------------------------------------------------------------------------
 # Options for Libraries
 
@@ -431,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
@@ -498,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@
@@ -590,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)
 
 # -----------------------------------------------------------------------------
@@ -723,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)
@@ -747,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)