Commitdb5f60c

committed

On cygwin and win32, don't override the shlib name when building a module.

Should fix regression test failures on those platforms.

1 parentbb6f1eb commitdb5f60cCopy full SHA for db5f60c

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

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.115 2008/04/07 23:08:15 petere Exp $`
	`9`	`+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.116 2008/04/08 09:50:29 petere Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -311,12 +311,16 @@ ifeq ($(PORTNAME), unixware)`
`311`	`311`	`endif`
`312`	`312`
`313`	`313`	`ifeq ($(PORTNAME), cygwin)`
`314`		`- shlib= cyg$(NAME)$(DLSUFFIX)`
	`314`	`+ ifdef SO_MAJOR_VERSION`
	`315`	`+ shlib= cyg$(NAME)$(DLSUFFIX)`
	`316`	`+ endif`
`315`	`317`	`haslibarule = yes`
`316`	`318`	`endif`
`317`	`319`
`318`	`320`	`ifeq ($(PORTNAME), win32)`
`319`		`- shlib= lib$(NAME)$(DLSUFFIX)`
	`321`	`+ ifdef SO_MAJOR_VERSION`
	`322`	`+ shlib= lib$(NAME)$(DLSUFFIX)`
	`323`	`+ endif`
`320`	`324`	`haslibarule = yes`
`321`	`325`	`endif`
`322`	`326`

Comments

(0)