Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
6d4bcda3
Commit
6d4bcda3
authored
Dec 03, 2005
by
Tom Lane
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix out-of-order inclusion of -L switches from LDFLAGS on AIX and HPUX.
Per example from Dirk Pirschel.
parent
d20901a3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
src/Makefile.shlib
src/Makefile.shlib
+6
-3
No files found.
src/Makefile.shlib
View file @
6d4bcda3
...
...
@@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California
#
# IDENTIFICATION
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.9
8 2005/10/28 17:32:22
tgl Exp $
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.9
9 2005/12/03 20:16:31
tgl Exp $
#
#-------------------------------------------------------------------------
...
...
@@ -76,6 +76,9 @@ ifeq ($(enable_shared), yes)
# Insert -L from LDFLAGS after any -L already present in SHLIB_LINK
SHLIB_LINK
:=
$(
filter
-L
%,
$(SHLIB_LINK)
)
$(
filter
-L
%,
$(LDFLAGS)
)
$(
filter-out
-L
%,
$(SHLIB_LINK)
)
# Need a -L-free version of LDFLAGS to use in combination with SHLIB_LINK
LDFLAGS_NO_L
:=
$(
filter-out
-L
%,
$(LDFLAGS)
)
# Default shlib naming convention used by the majority of platforms
shlib
=
lib
$(NAME)$(DLSUFFIX)
.
$(SO_MAJOR_VERSION)
.
$(SO_MINOR_VERSION)
shlib_major
=
lib
$(NAME)$(DLSUFFIX)
.
$(SO_MAJOR_VERSION)
...
...
@@ -154,7 +157,7 @@ endif
ifeq
($(PORTNAME), hpux)
shlib
=
lib
$(NAME)$(DLSUFFIX)
.
$(SO_MAJOR_VERSION)
ifeq
($(with_gnu_ld), yes)
LINK.shared
=
$(CC)
$(LDFLAGS)
-shared
-Wl
,-h
-Wl
,
$(soname)
LINK.shared
=
$(CC)
$(LDFLAGS
_NO_L
)
-shared
-Wl
,-h
-Wl
,
$(soname)
else
# can't use the CC-syntax rpath pattern here
rpath
=
...
...
@@ -309,7 +312,7 @@ else # PORTNAME == aix
# AIX case
$(shlib)
:
lib$(NAME).a
$(MKLDEXPORT)
lib
$(NAME)
.a
>
lib
$(NAME)$(EXPSUFF)
$(COMPILER)
$(LDFLAGS)
$(LDFLAGS_SL)
-o
$@
$<
-Wl
,-bE:lib
$(NAME)$(EXPSUFF)
$(SHLIB_LINK)
$(COMPILER)
$(LDFLAGS
_NO_L
)
$(LDFLAGS_SL)
-o
$@
$<
-Wl
,-bE:lib
$(NAME)$(EXPSUFF)
$(SHLIB_LINK)
endif
# PORTNAME == aix
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment