X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=970adaa1a7feb3fc5e0dc0ac4661e3272888d037;hb=1e06c8d372a465f84311020260a73d4578a9651e;hp=e0ff69021cb9e8270823b0a0c7eda20de735d2b0;hpb=c97259cd34b45eb5c06e93e82042dcca784609a6;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index e0ff690..970adaa 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -23,9 +23,6 @@ ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf)
 	       rts/dist/build/libHSrtsmain.a
 all_rts : $(ALL_RTS_LIBS)
 
-# The per-dir options
-$(eval $(call distdir-opts,rts,dist))
-
 # -----------------------------------------------------------------------------
 # Defining the sources
 
@@ -131,7 +128,12 @@ $(foreach way,$(rts_WAYS),$(eval $(call build-rts-way,$(way))))
 # Flags for compiling every file
 
 # We like plenty of warnings.
-WARNING_OPTS += -Wall -Wextra
+WARNING_OPTS += -Wall
+ifeq "$(GccLT34)" "YES"
+WARNING_OPTS += -W
+else
+WARNING_OPTS += -Wextra
+endif
 WARNING_OPTS += -Wstrict-prototypes 
 WARNING_OPTS += -Wmissing-prototypes 
 WARNING_OPTS += -Wmissing-declarations
@@ -189,7 +191,7 @@ 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.
-ifeq "$(TargetOS_CPP)" "openbsd"
+ifneq "$(findstring $(TargetOS_CPP), darwin openbsd)" ""
 rts_HC_OPTS += -optc-fno-stack-protector
 endif
 
@@ -372,9 +374,9 @@ install : install_rts
 
 .PHONY: install_rts
 install_rts:
-	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-	$(INSTALL_DIR) $(DESTDIR)$(libdir)/include
-	"$(CP)" $(ALL_RTS_LIBS) $(DESTDIR)$(libdir)
+	$(INSTALL_DIR) $(DESTDIR)$(ghclibdir)
+	$(INSTALL_DIR) $(DESTDIR)$(ghclibdir)/include
+	"$(CP)" $(ALL_RTS_LIBS) $(DESTDIR)$(ghclibdir)
 
 # -----------------------------------------------------------------------------
 # cleaning