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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 01bbc75..d12cbff 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -102,7 +102,7 @@ GhcDebugged=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)
+PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32 i386-apple-darwin),YES,NO)
 
 # ToDo later:
 # BuildStaticLibs=@BuildStaticLibs@
@@ -302,14 +302,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 +498,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 +564,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 +589,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@
@@ -652,6 +658,8 @@ SIZE			= size
 STRIP			= strip
 PATCH			= @PatchCmd@
 TAR			= @TarCmd@
+BZIP2                   = bzip2
+GZIP                    = gzip
 ZIP			= zip
 
 HSCOLOUR = @HSCOLOUR@