X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=2a20279382a0358c042e5b1c34d496afb4e32d3d;hb=6c3eae5d5e88117cf80b4b35c9bae4ba3ebbe94c;hp=db1c31e069067b23a91647758d8fc36d5f6c9fdf;hpb=1f9d5a8835940fa332f2b1b51ff59e0239b5fc3a;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index db1c31e..2a20279 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -36,7 +36,7 @@ endif
 # -----------------------------------------------------------------------------
 # RTS ways
 
-WAYS=$(GhcLibWays) $(GhcRTSWays)
+WAYS=$(strip $(GhcLibWays) $(GhcRTSWays))
 
 ifneq "$(findstring debug, $(way))" ""
 GhcRtsHcOpts=
@@ -177,6 +177,11 @@ LIB_LD_OPTS = -L$(shell $(GHC_PKG_INPLACE) field base library-dirs | sed -e 's/l
 endif
 endif
 
+# Mac OS X: make sure we compile for the right OS version
+SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
+SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+LIB_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
+
 # XXX DQ is now the same on all platforms, so get rid of it
 DQ = \"