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 8afeb1e..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))
 
-# Include support for generating Java
-GhcWithJavaGen=NO
-
 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@
 
-# Build the ObjectIO ?
-#
-GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
-
 # .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.
-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__
@@ -967,7 +960,7 @@ SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
 SRC_HSC2HS_OPTS += --cc=$(CC)
 SRC_HSC2HS_OPTS += --ld=$(CC)
 SRC_HSC2HS_OPTS += --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)
-SRC_HSC2HS_OPTS += --lflag=-no-link-haskell98
+SRC_HSC2HS_OPTS += --lflag=-no-auto-link-packages
 SRC_HSC2HS_OPTS += -I$(GHC_INCLUDE_DIR_ABS)
 SRC_HSC2HS_OPTS += -I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild