From 5feee2442591409f5413cd4a2e4074d434657e85 Mon Sep 17 00:00:00 2001 From: sof Date: Fri, 15 Apr 2005 18:13:34 +0000 Subject: [PATCH] [project @ 2005-04-15 18:13:34 by sof] LIBRARY, GHCI_LIBRARY: permit settings of these to be overridden in Makefiles; Merge to STABLE --- mk/package.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mk/package.mk b/mk/package.mk index b0841ba..7e2cd0a 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.52 2005/03/29 14:06:02 simonmar Exp $ +# $Id: package.mk,v 1.53 2005/04/15 18:13:34 sof Exp $ ifneq "$(PACKAGE)" "" @@ -184,7 +184,9 @@ ifeq "$(NON_HS_PACKAGE)" "" SRC_HC_OPTS += -fgenerics endif +ifndef LIBRARY LIBRARY = libHS$(PACKAGE)$(_way).a +endif ifeq "$(WAYS)" "" WAYS = $(GhcLibWays) @@ -276,7 +278,9 @@ ifneq "$(LIBRARY)" "" ifeq "$(way)" "" ifeq "$(GhcWithInterpreter)" "YES" +ifndef GHCI_LIBRARY GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY)) +endif ifneq "$(NO_INSTALL_LIBRARY)" "YES" INSTALL_LIBS += $(GHCI_LIBRARY) -- 1.7.10.4