Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
8e579752
Commit
8e579752
authored
20 years ago
by
Tom Lane
Browse files
Options
Downloads
Patches
Plain Diff
Clean up rpath handling for HPUX --- we can't use the cc-style rpath
switch syntax when calling ld directly.
parent
466fb067
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Makefile.shlib
+9
-3
9 additions, 3 deletions
src/Makefile.shlib
src/makefiles/Makefile.hpux
+2
-2
2 additions, 2 deletions
src/makefiles/Makefile.hpux
with
11 additions
and
5 deletions
src/Makefile.shlib
+
9
−
3
View file @
8e579752
...
...
@@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California
#
# IDENTIFICATION
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.8
8
2004/11/1
7 17:08:15
tgl Exp $
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.8
9
2004/11/1
9 21:27:42
tgl Exp $
#
#-------------------------------------------------------------------------
...
...
@@ -154,9 +154,15 @@ ifeq ($(PORTNAME), hpux)
SHLIB_LINK
+=
`
$(
CC
)
$(
LDFLAGS
)
-print-libgcc-file-name
`
endif
ifeq
($(with_gnu_ld), yes)
LINK.shared
=
$(
CC
)
$(
LDFLAGS
)
-shared
-Wl
,-h
-Wl
,
$(
soname
)
-Wl
,+b
-Wl
,
$(
libdir
)
LINK.shared
=
$(
CC
)
$(
LDFLAGS
)
-shared
-Wl
,-h
-Wl
,
$(
soname
)
else
LINK.shared
=
$(
LD
)
+h
$(
soname
)
-b
+b
$(
libdir
)
# can't use the CC-syntax rpath pattern here
rpath
=
ifeq
($(enable_rpath), yes)
LINK.shared
=
$(
LD
)
+h
$(
soname
)
-b
+b
$(
rpathdir
)
else
LINK.shared
=
$(
LD
)
+h
$(
soname
)
-b
endif
endif
endif
...
...
This diff is collapsed.
Click to expand it.
src/makefiles/Makefile.hpux
+
2
−
2
View file @
8e579752
...
...
@@ -19,9 +19,9 @@ LIBS := -lxnet $(LIBS)
# Set up rpath so that the executables don't need SHLIB_PATH to be set.
# (Note: --disable-rpath is a really bad idea on this platform...)
ifeq
($(with_gnu_ld), yes)
rpath
=
-Wl
,-rpath,
$(
rpathdir
)
rpath
=
-Wl
,-rpath
-Wl
,
$(
rpathdir
)
else
rpath
=
-Wl
,+b,
$(
rpathdir
)
rpath
=
-Wl
,+b
-Wl
,
$(
rpathdir
)
endif
# catch null pointer dereferences
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment