X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=9ada65425aaa04fe2795b47ebe358f34a491a26c;hb=0dffc568e18d34eeb6d1899ea767a3814d6be167;hp=6be0aa4228f1f4df6a2dc61fa9a53fbb5d6a63a6;hpb=8e9626ce5158f434a63f4948b5607150786f9c75;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6be0aa4..9ada654 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -12,9 +12,7 @@
 # DO NOT EDIT THIS FILE!
 #
 # 	- config.mk is auto-generated from config.mk.in by configure.
-#	  This may be triggered automatically by the build system (say
-#	  if config.mk.in has changed more recently than config.mk),
-#	  so if you edit config.mk your changes will be spammed.
+#	  If you edit config.mk your changes will be spammed.
 #
 #	- Settings in this file may be overriden by giving replacement
 #	  definitions in build.mk.  See build.mk.sample for a good
@@ -28,6 +26,7 @@
 TOP		= @hardtop@
 
 include $(TOP)/mk/project.mk
+include $(TOP)/mk/install.mk
 
 ################################################################################
 #
@@ -107,7 +106,12 @@ GhcDebugged=NO
 GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO)
 
 # Build shared and/or static libs?
-BuildSharedLibs=@BuildSharedLibs@
+PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux),YES,NO)
+ifeq "$(PlatformSupportsSharedLibs)" "YES"
+BuildSharedLibs = YES
+else
+BuildSharedLibs = NO
+endif
 # ToDo later:
 # BuildStaticLibs=@BuildStaticLibs@
 
@@ -148,7 +152,7 @@ GhcWithNativeCodeGen=$(strip\
 HaveLibDL = @HaveLibDL@
 
 # ArchSupportsSMP should be set iff there is support for that arch in
-# includes/SMP.h
+# includes/stg/SMP.h
 ArchSupportsSMP=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc powerpc)))
 
 # lazy test, because $(GhcUnregisterised) might be set in build.mk later.
@@ -177,6 +181,16 @@ else
 GhcEnableTablesNextToCode=YES
 endif
 
+# Whether to use libffi for adjustors (foreign import "wrapper") or
+# not.  If we have built-in support (rts/Adjustor.c) then we use that,
+# otherwise we fall back on libffi, which is slightly slower.
+ArchHasAdjustorSupport=$(strip $(if $(findstring $(HostArch_CPP),i386 x86_64 alpha powerpc ia64,),YES,NO))
+ifeq "$(ArchHasAdjustorSupport)" "YES"
+UseLibFFIForAdjustors=NO
+else
+UseLibFFIForAdjustors=YES
+endif
+
 # On Windows we normally want to make a relocatable bindist, to we
 # ignore flags like libdir
 ifeq "$(Windows)" "YES"
@@ -195,25 +209,6 @@ BeConservative = NO
 BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
 BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
-# Interface file version (hi-boot files only)
-#
-# A GHC built with HscIfaceFileVersion=n will look for 
-#	M.hi-boot-n, and only then for 
-#	M.hi-boot.
-# (It'll be happy with the latter if the former doesn't exist.)
-#
-#
-# This variable is used ONLY for hi-boot files.  Its only purpose is
-# to allow you to have a single directory with multiple .hi-boot files
-# for the same module, each corresponding to a different version of
-# GHC.
-#
-# HscIfaceFileVersion is propagated to hsc via
-# compiler/main/Config.hs, which is automatically generated by
-# compiler/Makefile.
-
-HscIfaceFileVersion=6
-
 #------------------------------------------------------------------------------
 # Options for Libraries
 
@@ -329,6 +324,8 @@ DotnetSupport=NO
 #
 GhcLibsWithUnix=@GhcLibsWithUnix@
 
+CHECK_PACKAGES = NO
+
 # ----------------------------------------------------------------------------
 # Options for GHC's RTS
 
@@ -383,147 +380,6 @@ BIN_DIST_LIST=$(TOP)/bindist-list
 WINDOWS_INSTALLER_BASE = ghc-$(ProjectVersion)-i386-windows
 WINDOWS_INSTALLER = $(WINDOWS_INSTALLER_BASE)$(exeext)
 
-# Definition of installation directories, we don't use half of these, but since
-# the configure script has them on offer while passing through, we might as well
-# set them. Note that we have to be careful, because the GNU coding standards
-# have changed a bit over the course of time, and autoconf development reflects
-# this.
-#
-# A little bit of history regarding autoconf and GNU coding standards, use this
-# as a cheat-sheet for the stuff below:
-#
-# variable    | default < 2.60     | default >= 2.60
-# ------------+--------------------+--------------------------------------
-# exec_prefix | ${prefix}          | ${prefix}
-# libdir      | ${exec_prefix}/lib | ${exec_prefix}/lib
-# datarootdir | NONE!              | ${prefix}/share
-# datadir     | ${prefix}/share    | ${datarootdir}
-# infodir     | ${prefix}/info     | ${datarootdir}/info
-# mandir      | ${prefix}/man      | ${datarootdir}/man
-# docdir      | NONE!              | ${datarootdir}/doc/${PACKAGE_TARNAME}
-# htmldir     | NONE!              | ${docdir}
-# dvidir      | NONE!              | ${docdir}
-# pdfdir      | NONE!              | ${docdir}
-# psdir       | NONE!              | ${docdir}
-#
-# NOTE: The default e.g. ${docdir} above means that autoconf substitutes the
-# string "${docdir}", not the value of docdir! This is crucial for the GNU
-# coding standards.
-
-# This gets used in the default docdir when autoconf >= 2.60 is used
-PACKAGE_TARNAME := @PACKAGE_TARNAME@
-
-prefix          := @prefix@
-
-# New autoconf (>= 2.60?) make a configure with a --datarootdir=DIR flag.
-# However, in order to support older autoconf's we don't use it.
-# datarootdir is set lower down instead.
-# But, as datadir is defined in terms of datarootdir, we also need to
-# set it to the value (if any) that configure gives it here.
-datarootdir     := @datarootdir@
-
-exec_prefix     := @exec_prefix@
-bindir          := @bindir@
-datadir0        := @datadir@
-libdir0         := @libdir@
-includedir      := @includedir@
-mandir          := @mandir@
-dynlibdir       := @libdir@
-
-ifeq "$(RelocatableBuild)" "YES"
-
-# Hack: our directory layouts tend to be different on Windows, so
-# hack around configure's bogus assumptions here.
-datarootdir := $(prefix)
-datadir     := $(prefix)/lib
-libdir      := $(prefix)/lib
-
-docdir    := $(prefix)/doc
-htmldir   := $(docdir)
-dvidir    := $(docdir)
-pdfdir    := $(docdir)
-psdir     := $(docdir)
-
-else
-
-# Unix: override libdir and datadir to put ghc-specific stuff in
-# a subdirectory with the version number included.
-#
-# datadir is set to libdir here as GHC needs package.conf and unlit
-# to be in the same place (and things like ghc-pkg need to agree on
-# where package.conf is, so we just set it globally).
-#
-datarootdir := $(datadir0)
-libdir      := $(libdir0)/ghc-$(ProjectVersion)
-datadir     := $(libdir)
-
-# New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
-# However, in order to support older autoconf's we don't use them.
-
-#docdir    := @docdir@
-#htmldir   := @htmldir@
-#dvidir    := @dvidir@
-#pdfdir    := @pdfdir@
-#psdir     := @psdir@
-
-docdir    := $(datarootdir)/doc/ghc
-htmldir   := $(docdir)
-dvidir    := $(docdir)
-pdfdir    := $(docdir)
-psdir     := $(docdir)
-
-endif # Windows
-
-headerdir := $(libdir)/include
-
-# Default place for putting interface files is $(libdir)
-# (overriden for packages in package.mk)
-ifacedir		= $(libdir)
-
-# NOTE: by intention, libexecdir and libdir point to 
-# the same place.
-#  => Only way to override this is to set libexecdir= on the command line.
-#     (NOTE: configure script setting is ignored).
-libexecdir		= $(libdir)
-
-#-----------------------------------------------------------------------------
-# install configuration
-
-#
-# Set this to have files installed with a specific owner
-#
-INSTALL_OWNER =
-
-# 
-# Set this to have files installed with a specific group
-#
-INSTALL_GROUP =
-
-#
-# Invocations of `install' for the four different classes
-# of targets:
-#
-INSTALL_PROGRAM = $(INSTALL) -m 755
-INSTALL_SCRIPT  = $(INSTALL) -m 755
-INSTALL_SHLIB   = $(INSTALL) -m 755
-INSTALL_DATA    = $(INSTALL) -m 644
-INSTALL_HEADER  = $(INSTALL) -m 644
-INSTALL_MAN     = $(INSTALL) -m 644
-INSTALL_DIR     = $(MKDIRHIER)
-
-#
-# runhaskell and hsc2hs are special, in that other compilers besides
-# GHC might provide them.  Systems with a package manager often come
-# with tools to manage this kind of clash, e.g. RPM's
-# update-alternatives.  When building a distribution for such a system,
-# we recommend setting both of the following to 'YES'.
-#
-# NO_INSTALL_RUNHASKELL = YES
-# NO_INSTALL_HSC2HS     = YES
-#
-# NB. we use negative tests here because for binary-distributions we cannot
-# test build-time variables at install-time, so they must default to on.
-
 # -----------------------------------------------------------------------------
 # Utilities programs: flags 
 
@@ -918,7 +774,7 @@ endif
 #
 # The ways currently defined.
 #
-ALL_WAYS=v p t l s mp mg debug dyn thr thr_l debug_dyn thr_dyn thr_debug_dyn thr_p thr_debug thr_debug_l
+ALL_WAYS=v p t l s mp mg debug dyn thr thr_l debug_dyn thr_dyn thr_debug_dyn thr_p thr_debug thr_debug_l debug_p thr_debug_p
 USER_WAYS=a b c d e f g h j k l m n o A B
 
 #