X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=db21b1482f57c7b20914ebc8860aa6d7d9165690;hb=9377b2d902d10df32596cd28f9814abb1a619262;hp=36dd2d3fd78b59b44ba4628217783dc8d2f6e754;hpb=a35d65c3465de9661325a9295715b1ef298eb888;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 36dd2d3..db21b14 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 amd64-unknown-freebsd i386-unknown-mingw32),YES,NO)
 
 # ToDo later:
 # BuildStaticLibs=@BuildStaticLibs@
@@ -302,9 +302,6 @@ SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\
 # By default, enable SplitObjs for the libraries if this build supports it
 SplitObjs=$(SupportsSplitObjs)
 
-# Math library
-LIBM=@LIBM@
-
 # .NET interop support?
 #
 DotnetSupport=NO
@@ -409,7 +406,6 @@ GHC_GENPRIMOP_PGM       = genprimopcode$(exeext)
 GHC_GENAPPLY_PGM        = genapply$(exeext)
 GHC_CABAL_PGM           = ghc-cabal$(exeext)
 GHC_PKG_PGM             = ghc-pkg$(exeext)
-GHC_MKDEPENDC_PGM       = mkdependC
 GHC_LTX_PGM             = ltx$(exeext)
 GHC_MKDIRHIER_PGM       = mkdirhier
 GHC_LNDIR_PGM           = lndir
@@ -433,7 +429,6 @@ LNDIR			= $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM)
 UNLIT			= $(INPLACE_LIB)/$(GHC_UNLIT_PGM)
 TOUCHY                  = $(INPLACE_LIB)/$(GHC_TOUCHY_PGM)
 MKDIRHIER		= $(INPLACE_BIN)/$(GHC_MKDIRHIER_PGM)
-MKDEPENDC 		= $(INPLACE_BIN)/$(GHC_MKDEPENDC_PGM)
 GHC_CABAL_INPLACE	= $(INPLACE_BIN)/$(GHC_CABAL_PGM)
 GENAPPLY_INPLACE	= $(INPLACE_BIN)/$(GHC_GENAPPLY_PGM)
 GHC_PKG_INPLACE		= $(INPLACE_BIN)/$(GHC_PKG_PGM)
@@ -501,9 +496,11 @@ GhcPatchLevel	= @GhcPatchLevel@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 
+# Keep this in sync with the variables in package-config.mk
 ghc_ge_609 = @ghc_ge_609@
 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
@@ -550,6 +547,7 @@ SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d))
 # Mingwex Library
 #
 HaveLibMingwEx	= @HaveLibMingwEx@
+DLLTOOL			= inplace/mingw/bin/dlltool.exe
 
 #-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
@@ -565,11 +563,14 @@ HaveLibMingwEx	= @HaveLibMingwEx@
 AR			= @ArCmd@
 AR_OPTS			= @ArArgs@
 ArSupportsInput		= @ArSupportsInput@
+ArIsGNUAr = @ArIsGNUAr@
 # Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
 BASH                    = /usr/local/bin/bash
 
 CONTEXT_DIFF		= @ContextDiffCmd@
 CP			= cp
+# It's not easy to separate the CPP program from its flags, as
+# AC_PROG_CPP defines CPP as "/usr/bin/gcc -E"
 CPP			= @CPP@ @CPPFLAGS@
 CTAGS 			= $(ETAGS)
 #
@@ -587,6 +588,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@
@@ -600,8 +603,12 @@ PIC			= pic
 PREPROCESSCMD		= $(CC) -E
 RANLIB			= @RANLIB@
 SED			= @SedCmd@
+TR 			= tr
 SHELL			= /bin/sh
 
+HaveDtrace		= @HaveDtrace@
+DTRACE			= @DtraceCmd@
+
 LD = @LdCmd@
 NM = @NmCmd@
 
@@ -650,6 +657,8 @@ SIZE			= size
 STRIP			= strip
 PATCH			= @PatchCmd@
 TAR			= @TarCmd@
+BZIP2                   = bzip2
+GZIP                    = gzip
 ZIP			= zip
 
 HSCOLOUR = @HSCOLOUR@