rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Andrew Dunstan
This commit is contained in:
Tom Lane 2004-11-16 21:51:13 +00:00
parent 6beb6fa495
commit bb85f1b9b1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.shlib
View File

@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California # Copyright (c) 1998, Regents of the University of California
# #
# IDENTIFICATION # IDENTIFICATION
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.86 2004/10/16 03:26:43 momjian Exp $ # $PostgreSQL: pgsql/src/Makefile.shlib,v 1.87 2004/11/16 21:51:13 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -220,10 +220,12 @@ ifeq ($(PORTNAME), cygwin)
shlib = $(NAME)$(DLSUFFIX) shlib = $(NAME)$(DLSUFFIX)
# needed for /contrib modules, not sure why # needed for /contrib modules, not sure why
SHLIB_LINK += -lpgport SHLIB_LINK += -lpgport
haslibarule = yes
endif endif
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
shlib = lib$(NAME)$(DLSUFFIX) shlib = lib$(NAME)$(DLSUFFIX)
haslibarule = yes
endif endif
ifeq ($(PORTNAME), beos) ifeq ($(PORTNAME), beos)
@ -257,6 +259,7 @@ ifndef LORDER
MK_NO_LORDER := true MK_NO_LORDER := true
endif endif
ifndef haslibarule
lib$(NAME).a: $(OBJS) lib$(NAME).a: $(OBJS)
ifdef MK_NO_LORDER ifdef MK_NO_LORDER
$(LINK.static) $@ $^ $(LINK.static) $@ $^
@ -264,6 +267,7 @@ else
$(LINK.static) $@ `$(LORDER) $^ | tsort` $(LINK.static) $@ `$(LORDER) $^ | tsort`
endif endif
$(RANLIB) $@ $(RANLIB) $@
endif #haslibarule
ifeq ($(enable_shared), yes) ifeq ($(enable_shared), yes)