X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=1ff6f625a058c1c5705d7be360d5fceb3a7155c2;hb=fa926e2e47c1a3e02e37e5446802e831e1b9ac7c;hp=7d475a336697552c8bae6543f12585e09ab609b5;hpb=d15229b75a07cf1092402f87950a1887c6429f3a;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 7d475a3..1ff6f62 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -44,7 +44,7 @@ rts_C_SRCS = $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(AL
 rts_CMM_SRCS = $(wildcard rts/*.cmm)
 
 # Don't compile .S files when bootstrapping a new arch
-ifeq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+ifneq "$(PORTING_HOST)" "YES"
 ifneq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" ""
 rts_S_SRCS += rts/AdjustorAsm.S
 else
@@ -252,11 +252,6 @@ rts_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
 rts_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
 rts_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 
-# Otherwise the stack-smash handler gets triggered.
-ifneq "$(findstring $(TargetOS_CPP), darwin openbsd)" ""
-rts_HC_OPTS += -optc-fno-stack-protector
-endif
-
 # We *want* type-checking of hand-written cmm.
 rts_HC_OPTS += -dcmm-lint 
 
@@ -469,6 +464,7 @@ endif
 
 ifneq "$(BINDIST)" "YES"
 rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o
+	"$(RM)" $(RM_OPTS) $@
 	"$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $<
 endif