projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the location of libffi.dll.a
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
5b04f6b
..
c4a0229
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-109,6
+109,7
@@
PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),\
i386-unknown-freebsd x86_64-unknown-freebsd \
i386-unknown-openbsd x86_64-unknown-openbsd \
i386-unknown-mingw32 \
i386-unknown-freebsd x86_64-unknown-freebsd \
i386-unknown-openbsd x86_64-unknown-openbsd \
i386-unknown-mingw32 \
+ i386-unknown-solaris2 \
i386-apple-darwin powerpc-apple-darwin),YES,NO)
# Build a compiler that will build *unregisterised* libraries and
i386-apple-darwin powerpc-apple-darwin),YES,NO)
# Build a compiler that will build *unregisterised* libraries and
@@
-145,9
+146,6
@@
GhcWithNativeCodeGen=$(strip\
$(if $(filter YESYESNO,\
$(OsSupportsNCG)$(ArchSupportsNCG)$(GhcUnregisterised)),YES,NO))
$(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
HaveLibDL = @HaveLibDL@
# ArchSupportsSMP should be set iff there is support for that arch in
@@
-436,7
+434,6
@@
GHC_PKG_PGM = ghc-pkg$(exeext)
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
-GHC_DUMMY_GHC_PGM = dummy-ghc$(exeext)
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
GHC_CP = "xcopy /y"
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
GHC_CP = "xcopy /y"
@@
-462,7
+459,6
@@
GHC_PKG_INPLACE = $(INPLACE_BIN)/$(GHC_PKG_PGM)
GHCTAGS_INPLACE = $(INPLACE_BIN)/$(GHC_GHCTAGS_PGM)
HSC2HS_INPLACE = $(INPLACE_BIN)/$(GHC_HSC2HS_PGM)
GENPRIMOP_INPLACE = $(INPLACE_BIN)/$(GHC_GENPRIMOP_PGM)
GHCTAGS_INPLACE = $(INPLACE_BIN)/$(GHC_GHCTAGS_PGM)
HSC2HS_INPLACE = $(INPLACE_BIN)/$(GHC_HSC2HS_PGM)
GENPRIMOP_INPLACE = $(INPLACE_BIN)/$(GHC_GENPRIMOP_PGM)
-DUMMY_GHC_INPLACE = $(INPLACE_BIN)/$(GHC_DUMMY_GHC_PGM)
GENERATED_FILE = chmod a-w
EXECUTABLE_FILE = chmod +x
GENERATED_FILE = chmod a-w
EXECUTABLE_FILE = chmod +x
@@
-623,6
+619,9
@@
TR = tr
SHELL = /bin/sh
HaveDtrace = @HaveDtrace@
SHELL = /bin/sh
HaveDtrace = @HaveDtrace@
+# There are problems with dtrace on 64bit 10.5. For now at least, we
+# just turn dtrace off unless you override USE_DTRACE
+USE_DTRACE = NO
DTRACE = @DtraceCmd@
LD = @LdCmd@
DTRACE = @DtraceCmd@
LD = @LdCmd@
@@
-724,10
+723,6
@@
HAPPY_VERSION = @HappyVersion@
#
SRC_HAPPY_OPTS = -agc --strict
#
SRC_HAPPY_OPTS = -agc --strict
-# Temp. to work around performance problems in the HEAD around 8/12/2003,
-# A Happy compiled with this compiler needs more stack.
-SRC_HAPPY_OPTS += +RTS -K2m -RTS
-
#
# Alex
#
#
# Alex
#