From 541e3935bf08f96b49e61b4cf900d02776b8326f Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 27 Oct 2007 14:29:14 +0000 Subject: [PATCH] We need to set _way=* in rts/ both when making and installing bindists This is a hack, but it means we get libHSrts*.a etc rather than just libHSrts.a. --- Makefile | 4 +--- rts/Makefile | 8 ++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0bd8f66..acee11b 100644 --- a/Makefile +++ b/Makefile @@ -302,9 +302,7 @@ binary-dist:: $(MAKE) -C gmp binary-dist DOING_BIN_DIST=YES $(MAKE) -C includes binary-dist DOING_BIN_DIST=YES $(MAKE) -C compiler binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE) - # Setting _way here is a nasty hack to make sure we get - # libHSrts*.a etc rather than just libHSrts.a - $(MAKE) -C rts binary-dist DOING_BIN_DIST=YES _way='*' + $(MAKE) -C rts binary-dist DOING_BIN_DIST=YES $(MAKE) -C driver binary-dist DOING_BIN_DIST=YES $(MAKE) -C utils binary-dist DOING_BIN_DIST=YES $(MAKE) -C docs binary-dist DOING_BIN_DIST=YES diff --git a/rts/Makefile b/rts/Makefile index 7e9dc08..3cde19d 100644 --- a/rts/Makefile +++ b/rts/Makefile @@ -25,6 +25,14 @@ PACKAGE = rts HC=$(GHC_INPLACE) + +# Setting _way here is a nasty hack to make sure we get libHSrts*.a etc +# rather than just libHSrts.a when we are making and installing +# bindists. +ifeq "$(DOING_BIN_DIST)" "YES" +_way = * +endif + # ----------------------------------------------------------------------------- # RTS ways -- 1.7.10.4