NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit8307b09

committed

Still more third thoughts: when linking shared libraries, LDFLAGS probably

needs to appear before anything placed in SHLIB_LINK. This is becauseSHLIB_LINK is typically a subset of LIBS, and LIBS has to appear afterLDFLAGS on platforms that are sensitive to the relative order of -L and -lswitches.

1 parent0a4ecfe commit8307b09Copy full SHA for 8307b09

File tree

1 file changed

-7

lines changed

src
- Makefile.shlib

1 file changed

-7

lines changed

`‎src/Makefile.shlib`

Lines changed: 4 additions & 7 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.124 2010/07/05 18:54:37 tgl Exp $`
	`9`	`+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.125 2010/07/06 03:55:33 tgl Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -78,9 +78,6 @@ LINK.static = $(AR) $(AROPT)`
`78`	`78`
`79`	`79`
`80`	`80`
`81`		`-# Automatically append LDFLAGS and LDFLAGS_SL to SHLIB_LINK`
`82`		`-SHLIB_LINK += $(LDFLAGS) $(LDFLAGS_SL)`
`83`		`-`
`84`	`81`	`ifdef SO_MAJOR_VERSION`
`85`	`82`	`# Default library naming convention used by the majority of platforms`
`86`	`83`	`ifeq ($(enable_shared), yes)`
`@@ -355,7 +352,7 @@ ifneq ($(PORTNAME), aix)`
`355`	`352`
`356`	`353`	`# Normal case`
`357`	`354`	`$(shlib): $(OBJS)`
`358`		`-$(LINK.shared) -o $@ $(OBJS) $(SHLIB_LINK)`
	`355`	`+$(LINK.shared) -o $@ $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)`
`359`	`356`	`ifdef shlib_major`
`360`	`357`	`# If we're using major and minor versions, then make a symlink to major-version-only.`
`361`	`358`	`ifneq ($(shlib), $(shlib_major))`
`@@ -389,7 +386,7 @@ $(shlib) $(stlib): $(OBJS)`
`389`	`386`	`$(LINK.static) $(stlib) $^`
`390`	`387`	`$(RANLIB) $(stlib)`
`391`	`388`	`$(MKLDEXPORT) $(stlib) >$(exports_file)`
`392`		`-$(COMPILER) -o $(shlib) $(stlib) -Wl,-bE:$(exports_file) $(SHLIB_LINK)`
	`389`	`+$(COMPILER) -o $(shlib) $(stlib) -Wl,-bE:$(exports_file) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)`
`393`	`390`	`rm -f $(stlib)`
`394`	`391`	`$(AR) $(AROPT) $(stlib) $(shlib)`
`395`	`392`
`@@ -412,7 +409,7 @@ DLL_DEFFILE = lib$(NAME)dll.def`
`412`	`409`	`endif`
`413`	`410`
`414`	`411`	`$(shlib): $(OBJS) $(DLL_DEFFILE)`
`415`		`-$(DLLWRAP) -o $@ --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(DLL_DEFFILE) $(OBJS) $(SHLIB_LINK)`
	`412`	`+$(DLLWRAP) -o $@ --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(DLL_DEFFILE) $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)`
`416`	`413`
`417`	`414`	`$(stlib): $(shlib) $(DLL_DEFFILE)`
`418`	`415`	`$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(DLL_DEFFILE) --output-lib $@`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8307b09

File tree

1 file changed

1 file changed

`‎src/Makefile.shlib`

0 commit comments