X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=6385c779220b7f9ded1474f77b58e3e48f3a7dfd;hb=9fd4126858ff63ef9dc1c71f439eed11ef69f169;hp=f883d18659b99d327acd40fa7afed8dbbd2d54e8;hpb=f0b4484fe63df5cedfa44d7486a3157ea6f39558;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index f883d18..6385c77 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -77,8 +77,8 @@ count :
 #  There are other plausible designs that might work, but each has different
 #  problems:
 #
-#  - using -odir and -hidir: GHC <= 4.08 doesn't support -hidir, and
-#    anyway -odir puts all the objects in one directory (strips off the
+#  - using -odir and -hidir:
+#    -odir puts all the objects in one directory (strips off the
 #    subdirectory part), which eventually forces us to use VPATH to find
 #    the sources.  I have a really bad feeling about VPATH.
 #
@@ -110,15 +110,6 @@ endif
 endif
 
 boot :: stage_dirs
-# On Windows, we can't use symbolic links for the -hi-boot files
-# because GHC itself is a Mingw program and does not understand
-# symbolic links.  So we have to copy the files instead of link them.
-# That means that if you modify a .hi-boot file in Windows, you
-# have to to say 'make boot' again.
-#
-# PS: 'ln -s foo baz' takes 'foo' relative to the path to 'baz'
-#     whereas 'cp foo baz' treats the two paths independently.
-#     Hence the "../.." in the ln command line
 
 ifeq "$(stage)" "1"
 HC=$(GHC)
@@ -263,12 +254,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
 	@echo "cGHC_CP               = \"$(GHC_CP)\"" >> $(CONFIG_HS)
 	@echo "cGHC_PERL             :: String" >> $(CONFIG_HS)
 	@echo "cGHC_PERL             = \"$(GHC_PERL)\"" >> $(CONFIG_HS)
-ifeq ($(GhcWithIlx),YES)
-	@echo "cILX2IL               :: String" >> $(CONFIG_HS)
-	@echo "cILX2IL               = \"$(ILX2IL)\"" >> $(CONFIG_HS)
-	@echo "cILASM                :: String" >> $(CONFIG_HS)
-	@echo "cILASM                = \"$(ILASM)\"" >> $(CONFIG_HS)
-endif
 	@echo "cEnableWin32DLLs      :: String" >> $(CONFIG_HS)
 	@echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS)
 	@echo "cCONTEXT_DIFF         :: String" >> $(CONFIG_HS)
@@ -425,16 +410,6 @@ else
 SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN
 endif
 
-ifeq ($(GhcWithIlx),YES)
-ALL_DIRS += ilxGen
-SRC_HC_OPTS += -DILX
-endif
-
-ifeq ($(GhcWithJavaGen),YES)
-ALL_DIRS += javaGen
-SRC_HC_OPTS += -DJAVA
-endif
-
 ifeq "$(BootingFromHc)" "YES"
 # HC files are always from a self-booted compiler
 bootstrapped = YES
@@ -596,30 +571,6 @@ ifeq "$(BootingFromHc)" "YES"
 SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 endif
 
-# 	Special flags for particular modules
-#	The standard suffix rule for compiling a Haskell file
-#	adds these flags to the command line
-
-# There used to be a -fforce-recomp flag on PrimOp, but why?
-# It's an expensive module to recompile!
-prelude/PrimOp_HC_OPTS 		= -H80m
-
-
-main/ParsePkgConf_HC_OPTS	+= -fno-warn-incomplete-patterns
-parser/Parser_HC_OPTS 		+= -fno-warn-incomplete-patterns
-
-# Careful optimisation of the parser: we don't want to throw everything
-# at it, because that takes too long and doesn't buy much, but we do want
-# to inline certain key external functions, so we instruct GHC not to
-# throw away inlinings as it would normally do in -O0 mode:
-parser/Parser_HC_OPTS		+= -O0 -fno-ignore-interface-pragmas
-
-ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9"
-rename/RnMonad_HC_OPTS 		=  -O2 -O2-for-C
-endif
-
-# basicTypes/SrcLoc_HC_OPTS	= -funbox-strict-fields
-
 # ---- Profiling ----
 #simplCore/Simplify_HC_OPTS = -auto-all
 #simplCore/SimplEnv_HC_OPTS = -auto-all
@@ -648,10 +599,6 @@ endif
 # prototype via a global option instead of a myriad of per-file OPTIONS
 SRC_HC_OPTS += '-\#include "cutils.h"'
 
-ifeq "$(ghc_ge_605)" "NO"
-utils/LazyUniqFM_HC_OPTS += -fallow-undecidable-instances
-endif
-
 # ----------------------------------------------------------------------------
 #		Generate supporting stuff for prelude/PrimOp.lhs 
 #		from prelude/primops.txt