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

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 8b6ecb1..1ff6f62 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -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