Commitbb85f1b

committed

Suppress duplicate rules for lib$(NAME).a on WIN32 and Cygwin.

Andrew Dunstan

1 parent6beb6fa commitbb85f1bCopy full SHA for bb85f1b

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Copyright (c) 1998, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.86 2004/10/1603:26:43 momjian Exp $`
	`9`	`+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.87 2004/11/1621:51:13 tgl Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -220,10 +220,12 @@ ifeq ($(PORTNAME), cygwin)`
`220`	`220`	`shlib= $(NAME)$(DLSUFFIX)`
`221`	`221`	`# needed for /contrib modules, not sure why`
`222`	`222`	`SHLIB_LINK+= -lpgport`
	`223`	`+ haslibarule = yes`
`223`	`224`	`endif`
`224`	`225`
`225`	`226`	`ifeq ($(PORTNAME), win32)`
`226`	`227`	`shlib= lib$(NAME)$(DLSUFFIX)`
	`228`	`+ haslibarule = yes`
`227`	`229`	`endif`
`228`	`230`
`229`	`231`	`ifeq ($(PORTNAME), beos)`
`@@ -257,13 +259,15 @@ ifndef LORDER`
`257`	`259`	`MK_NO_LORDER := true`
`258`	`260`	`endif`
`259`	`261`
	`262`	`+ifndef haslibarule`
`260`	`263`	`lib$(NAME).a: $(OBJS)`
`261`	`264`	`ifdef MK_NO_LORDER`
`262`	`265`	`$(LINK.static) $@ $^`
`263`	`266`	`else`
`264`	`267`	$(LINK.static) $@ `$(LORDER) $^ \| tsort`
`265`	`268`	`endif`
`266`	`269`	`$(RANLIB) $@`
	`270`	`+endif #haslibarule`
`267`	`271`
`268`	`272`	`ifeq ($(enable_shared), yes)`
`269`	`273`

Comments

(0)