projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix primMname in External Core printer
[ghc-hetmet.git]
/
rts
/
Makefile
diff --git
a/rts/Makefile
b/rts/Makefile
index
db1c31e
..
2a20279
100644
(file)
--- a/
rts/Makefile
+++ b/
rts/Makefile
@@
-36,7
+36,7
@@
endif
# -----------------------------------------------------------------------------
# RTS ways
# -----------------------------------------------------------------------------
# RTS ways
-WAYS=$(GhcLibWays) $(GhcRTSWays)
+WAYS=$(strip $(GhcLibWays) $(GhcRTSWays))
ifneq "$(findstring debug, $(way))" ""
GhcRtsHcOpts=
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
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 = \"
# XXX DQ is now the same on all platforms, so get rid of it
DQ = \"