projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Two things to do with -dsuppress-uniques
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
4431dd8
..
1c59048
100644
(file)
--- 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?
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),YES,NO)
# ToDo later:
# BuildStaticLibs=@BuildStaticLibs@
# 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)
# By default, enable SplitObjs for the libraries if this build supports it
SplitObjs=$(SupportsSplitObjs)
-# Math library
-LIBM=@LIBM@
-
# .NET interop support?
#
DotnetSupport=NO
# .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_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
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)
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)
GHC_CABAL_INPLACE = $(INPLACE_BIN)/$(GHC_CABAL_PGM)
GENAPPLY_INPLACE = $(INPLACE_BIN)/$(GHC_GENAPPLY_PGM)
GHC_PKG_INPLACE = $(INPLACE_BIN)/$(GHC_PKG_PGM)
@@
-550,7
+545,7
@@
SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d))
# Mingwex Library
#
HaveLibMingwEx = @HaveLibMingwEx@
# Mingwex Library
#
HaveLibMingwEx = @HaveLibMingwEx@
-DLLTOOL = @DlltoolCmd@
+DLLTOOL = inplace/mingw/bin/dlltool.exe
#-----------------------------------------------------------------------------
# Flex (currently unused, could be moved to glafp-utils)
#-----------------------------------------------------------------------------
# Flex (currently unused, could be moved to glafp-utils)
@@
-571,6
+566,8
@@
BASH = /usr/local/bin/bash
CONTEXT_DIFF = @ContextDiffCmd@
CP = cp
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)
#
CPP = @CPP@ @CPPFLAGS@
CTAGS = $(ETAGS)
#
@@
-601,8
+598,12
@@
PIC = pic
PREPROCESSCMD = $(CC) -E
RANLIB = @RANLIB@
SED = @SedCmd@
PREPROCESSCMD = $(CC) -E
RANLIB = @RANLIB@
SED = @SedCmd@
+TR = tr
SHELL = /bin/sh
SHELL = /bin/sh
+HaveDtrace = @HaveDtrace@
+DTRACE = @DtraceCmd@
+
LD = @LdCmd@
NM = @NmCmd@
LD = @LdCmd@
NM = @NmCmd@
@@
-651,6
+652,8
@@
SIZE = size
STRIP = strip
PATCH = @PatchCmd@
TAR = @TarCmd@
STRIP = strip
PATCH = @PatchCmd@
TAR = @TarCmd@
+BZIP2 = bzip2
+GZIP = gzip
ZIP = zip
HSCOLOUR = @HSCOLOUR@
ZIP = zip
HSCOLOUR = @HSCOLOUR@