From d1aa0f9622efacd2f0b5eb7ca0471669011e8f1f Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 19 Jan 2010 23:26:23 +0000 Subject: [PATCH] Change how RTS libraries get installed; fixes trac #3794 --- rts/ghc.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rts/ghc.mk b/rts/ghc.mk index ec2b9b3..0cb279a 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -128,6 +128,8 @@ endif # Building one way define build-rts-way # args: $1 = way +ifneq "$$(BINDIST)" "YES" + # The per-way CC_OPTS ifneq "$$(findstring debug, $1)" "" rts_dist_$1_HC_OPTS = @@ -181,6 +183,8 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) echo $$(rts_$1_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ endif +endif + endef # And expand the above for each way: @@ -417,8 +421,10 @@ endif # ----------------------------------------------------------------------------- # build the static lib containing the C main symbol +ifneq "$(BINDIST)" "YES" rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o "$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $< +endif # ----------------------------------------------------------------------------- # The RTS package config @@ -441,13 +447,7 @@ endif # ----------------------------------------------------------------------------- # installing -install : install_rts - -.PHONY: install_rts -install_rts: - $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)" - $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/include" - "$(CP)" $(ALL_RTS_LIBS) "$(DESTDIR)$(ghclibdir)" +INSTALL_LIBS += $(ALL_RTS_LIBS) # ----------------------------------------------------------------------------- # cleaning -- 1.7.10.4