projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define CABAL in mk/cabal-flags.mk, rather than everywhere we use it
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
be65b24
..
e1b2ef3
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-277,9
+277,6
@@
GhcWithNativeCodeGen=$(strip\
$(if $(filter YESYESNO,\
$(OsSupportsNCG)$(ArchSupportsNCG)$(GhcUnregisterised)),YES,NO))
$(if $(filter YESYESNO,\
$(OsSupportsNCG)$(ArchSupportsNCG)$(GhcUnregisterised)),YES,NO))
-# Include support for generating Java
-GhcWithJavaGen=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
@@
-442,10
+439,6
@@
SplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),\
# Math library
LIBM=@LIBM@
# Math library
LIBM=@LIBM@
-# Build the ObjectIO ?
-#
-GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
-
# .NET interop support?
#
DotnetSupport=@DotnetSupport@
# .NET interop support?
#
DotnetSupport=@DotnetSupport@
@@
-700,7
+693,7
@@
SRC_LINT_OPTS += -axz -DLINT $(SRC_CPP_OPTS)
WAY$(_way)_LINT_OPTS += WAY$(_way)_CPP_OPTS
# Default fptools options for dllwrap.
WAY$(_way)_LINT_OPTS += WAY$(_way)_CPP_OPTS
# Default fptools options for dllwrap.
-SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32
+SRC_BLD_DLL_OPTS += --target=i386-mingw32
# Flags for CPP when running GreenCard on .pgc files
GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
# Flags for CPP when running GreenCard on .pgc files
GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__