Added configure gadgets to detect Papi, and fixed build problems

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 806908b..9420663 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -277,6 +277,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).
@@ -355,6 +366,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
@@ -703,6 +723,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 +748,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)
@@ -965,6 +987,9 @@ UNAME                       = uname
 # GTK+
 GTK_CONFIG = @GTK_CONFIG@
 
+# PAPI
+USE_PAPI   = @USE_PAPI@
+
 #-----------------------------------------------------------------------------
 # DocBook XML stuff