X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ac5b29368feca1a8bdf97fcec7a3e8270df6c435;hp=01bbc75b1d9b15882f83e011cd4549eeb7839bcc;hb=0481fe092fd9e274096fff1fd9885fd68805202a;hpb=fb783aeaa5bc1cc60e6bb551c1cd01a097b84fad

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 01bbc75..ac5b293 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -99,13 +99,11 @@ GhcStage3HcOpts=-O2
 
 GhcProfiled=NO
 GhcDebugged=NO
+GhcDynamic=NO
 GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO)
 
 # Do we support shared libs?
-PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux),YES,NO)
-
-# ToDo later:
-# BuildStaticLibs=@BuildStaticLibs@
+PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32 i386-apple-darwin powerpc-apple-darwin),YES,NO)
 
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and
@@ -141,6 +139,9 @@ GhcWithNativeCodeGen=$(strip\
     $(if $(filter YESYESNO,\
 		  $(OsSupportsNCG)$(ArchSupportsNCG)$(GhcUnregisterised)),YES,NO))
 
+# Build a compiler with the llvm code generator backend
+GhcWithLlvmCodeGen=NO
+
 HaveLibDL = @HaveLibDL@
 
 # ArchSupportsSMP should be set iff there is support for that arch in
@@ -302,14 +303,16 @@ SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\
 # By default, enable SplitObjs for the libraries if this build supports it
 SplitObjs=$(SupportsSplitObjs)
 
-# .NET interop support?
-#
-DotnetSupport=NO
+# ----------------------------------------------------------------------------
+# Package-related things
 
-# Build unix package?
-#
-GhcLibsWithUnix=@GhcLibsWithUnix@
+# Extra packages to add to the build, in dependency order
+EXTRA_PACKAGES =
+
+# Whether to install $(EXTRA_PACKAGES)
+InstallExtraPackages = NO
 
+# Run "ghc-pkg check" on each package
 CHECK_PACKAGES = NO
 
 # ----------------------------------------------------------------------------
@@ -496,9 +499,10 @@ GhcPatchLevel	= @GhcPatchLevel@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 
-ghc_ge_609 = @ghc_ge_609@
+# Keep this in sync with the variables in package-config.mk
 ghc_ge_6102 = @ghc_ge_6102@
 ghc_ge_611 = @ghc_ge_611@
+ghc_ge_613 = @ghc_ge_613@
 
 # Canonicalised ghc version number, used for easy (integer) version
 # comparisons.  We must expand $(GhcMinVersion) to two digits by
@@ -561,6 +565,7 @@ DLLTOOL			= inplace/mingw/bin/dlltool.exe
 AR			= @ArCmd@
 AR_OPTS			= @ArArgs@
 ArSupportsInput		= @ArSupportsInput@
+ArSupportsAtFile = @ArSupportsAtFile@
 # Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
 BASH                    = /usr/local/bin/bash
 
@@ -585,6 +590,8 @@ INSTALL			= @INSTALL@
 # 
 INSTALL			:= $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL))
 LATEX			= latex
+PDFLATEX        = pdflatex
+BIBTEX          = bibtex
 HEVEA			= hevea
 HACHA			= hacha
 LN_S			= @LN_S@
@@ -647,12 +654,14 @@ endif
 # with REAL_SHELL set to something else than /bin/sh, for instance, your favourite
 # command shell.
 #
-REAL_SHELL=$(SHELL)
-SIZE			= size
-STRIP			= strip
-PATCH			= @PatchCmd@
-TAR			= @TarCmd@
-ZIP			= zip
+REAL_SHELL     = $(SHELL)
+
+SIZE_CMD       = size
+STRIP_CMD      = strip
+PATCH_CMD      = @PatchCmd@
+TAR_CMD        = @TarCmd@
+BZIP2_CMD      = bzip2
+GZIP_CMD       = gzip
 
 HSCOLOUR = @HSCOLOUR@
 
@@ -779,12 +788,5 @@ CONFIGURE_ARGS = @CONFIGURE_ARGS@
 ICONV_INCLUDE_DIRS = @ICONV_INCLUDE_DIRS@
 ICONV_LIB_DIRS = @ICONV_LIB_DIRS@
 
-################################################################################
-#
-#    Bindist testing directory
-#
-################################################################################
-
-BIN_DIST_INST_SUBDIR = "install dir"
-BIN_DIST_INST_DIR = $(TOP)/bindisttest/$(BIN_DIST_INST_SUBDIR)
-
+GMP_INCLUDE_DIRS = @GMP_INCLUDE_DIRS@
+GMP_LIB_DIRS = @GMP_LIB_DIRS@