projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the build for non-GNU-ar
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
ea3c1ff
..
db21b14
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 i386-unknown-freebsd amd64-unknown-freebsd),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@
# ToDo later:
# BuildStaticLibs=@BuildStaticLibs@
@@
-496,9
+496,11
@@
GhcPatchLevel = @GhcPatchLevel@
GhcMajVersion = @GhcMajVersion@
GhcMinVersion = @GhcMinVersion@
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_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
# Canonicalised ghc version number, used for easy (integer) version
# comparisons. We must expand $(GhcMinVersion) to two digits by
@@
-561,6
+563,7
@@
DLLTOOL = inplace/mingw/bin/dlltool.exe
AR = @ArCmd@
AR_OPTS = @ArArgs@
ArSupportsInput = @ArSupportsInput@
AR = @ArCmd@
AR_OPTS = @ArArgs@
ArSupportsInput = @ArSupportsInput@
+ArIsGNUAr = @ArIsGNUAr@
# Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
BASH = /usr/local/bin/bash
# Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
BASH = /usr/local/bin/bash
@@
-585,6
+588,8
@@
INSTALL = @INSTALL@
#
INSTALL := $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL))
LATEX = latex
#
INSTALL := $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL))
LATEX = latex
+PDFLATEX = pdflatex
+BIBTEX = bibtex
HEVEA = hevea
HACHA = hacha
LN_S = @LN_S@
HEVEA = hevea
HACHA = hacha
LN_S = @LN_S@
@@
-652,6
+657,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@