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

diff --git a/compiler/Makefile b/compiler/Makefile
index ea3e07b..f883d18 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -52,9 +52,6 @@ count :
 #  - for stage N, object files and .hi files are placed inside 
 #    the directory stageN, in subdirectories as per the sources.
 #
-#  - .hi-boot files are *linked* into the stageN tree, because in GHC 5.05+
-#    the .hi-boot file must reside in the same place as the .hi file.
-#
 #  - we use explicit -o and -ohi options to direct the output from C & 
 #    Haskell compilations.
 #
@@ -122,18 +119,6 @@ boot :: stage_dirs
 # 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 "$(UsingHsBoot)" "NO"
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-	for i in */*hi-boot*; do \
-	    cp -u -f $$i stage$(stage)/$$i; \
-	done
-else
-	for i in */*hi-boot*; do \
-	    ($(RM) -f stage$(stage)/$$i \
-	       && $(LN_S) ../../$$i stage$(stage)/$$i) || true ; \
-	done
-endif
-endif
 
 ifeq "$(stage)" "1"
 HC=$(GHC)
@@ -160,12 +145,7 @@ odir=stage$(stage)
 
 SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS))
 
-SRC_HC_OPTS += -Wall -fno-warn-name-shadowing
-# Turn off orphan warnings, but only if the flag exists (i.e. not if we
-# are building stage 1 and using GHC < 6.3).
-ifneq "$(stage)" "1 NO"
-SRC_HC_OPTS += -fno-warn-orphans
-endif
+SRC_HC_OPTS += -Wall -fno-warn-name-shadowing -fno-warn-orphans
 
 HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
 C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS))))
@@ -588,11 +568,6 @@ endif
 # Disaster!  Then the hc file sees the GHC 5.02 (or whatever)
 # include files.   For the moment we've reverted to using
 # an explicit path in the .hs sources
-#
-# For the benefit of <5.00 compilers, do include GHC_INCLUDE_DIR
-# when generating dependencies. (=> it gets passed onto mkdependHS,
-# which needs it).
-SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
 # We need System.Posix (or Posix when ghc < 6.2)
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@@ -645,14 +620,6 @@ endif
 
 # basicTypes/SrcLoc_HC_OPTS	= -funbox-strict-fields
 
-# We always optimise some low-level modules, otherwise performance of
-# a non-optimised compiler is severely affected.
-utils/Binary_HC_OPTS		+= -O -funbox-strict-fields
-utils/FastMutInt_HC_OPTS	+= -O
-utils/Encoding_HC_OPTS		+= -O
-utils/StringBuffer_HC_OPTS	+= -O -funbox-strict-fields
-utils/FastString_HC_OPTS	+= -O -funbox-strict-fields
-
 # ---- Profiling ----
 #simplCore/Simplify_HC_OPTS = -auto-all
 #simplCore/SimplEnv_HC_OPTS = -auto-all
@@ -677,8 +644,6 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 main/SysTools_HC_OPTS		+= '-\#include <windows.h>' '-\#include <process.h>'
 endif
 
-parser/Lexer_HC_OPTS += -funbox-strict-fields
-
 # ghc_strlen percolates through so many modules that it is easier to get its
 # prototype via a global option instead of a myriad of per-file OPTIONS
 SRC_HC_OPTS += '-\#include "cutils.h"'