summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2024-03-13 15:03:21 (GMT)
committerGitHub <noreply@github.com>2024-03-13 15:03:21 (GMT)
commitcfb1c798b9bbf4dbe875cfc63babfd677d7cddde (patch)
tree6ee38c7ce684f956ba688c33ee67c7cc820931f2 /c++
parentca4db46c5abe5b3432b3e7255bbf39265fd9e042 (diff)
downloadhdf5-cfb1c798b9bbf4dbe875cfc63babfd677d7cddde.zip
hdf5-cfb1c798b9bbf4dbe875cfc63babfd677d7cddde.tar.gz
hdf5-cfb1c798b9bbf4dbe875cfc63babfd677d7cddde.tar.bz2
Don't set the rpath when linking statically (#4125)
Diffstat (limited to 'c++')
-rw-r--r--c++/src/h5c++.in42
1 files changed, 21 insertions, 21 deletions
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index e666ba9..a5c584c 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -314,27 +314,27 @@ if test "x$do_link" = "xyes"; then
fi
link_args="$link_args -L${libdir}"
- case "$kind" in
- gcc|linux*)
- # MacOS X doesn't support the "-Wl,-rpath -Wl," style of linker flags.
- # It appears to want none of them specified.
- case "$host_os" in
- darwin*) flag="" ;;
- *) flag="-Wl,-rpath -Wl," ;;
- esac
- ;;
- hpux*) flag="-Wl,+b -Wl," ;;
- freebsd*|solaris*) flag="-R" ;;
- rs6000*|aix*) flag="-L" ;;
- sgi) flag="-rpath " ;;
- *) flag="" ;;
- esac
-
- if test -n "$flag"; then
- shared_link="${flag}${libdir}"
- fi
-
- if test "x$USE_SHARED_LIB" != "xyes"; then
+ if test "x$USE_SHARED_LIB" = "xyes"; then
+ case "$kind" in
+ gcc|linux*)
+ # MacOS X doesn't support the "-Wl,-rpath -Wl," style of linker flags.
+ # It appears to want none of them specified.
+ case "$host_os" in
+ darwin*) flag="" ;;
+ *) flag="-Wl,-rpath -Wl," ;;
+ esac
+ ;;
+ hpux*) flag="-Wl,+b -Wl," ;;
+ freebsd*|solaris*) flag="-R" ;;
+ rs6000*|aix*) flag="-L" ;;
+ sgi) flag="-rpath " ;;
+ *) flag="" ;;
+ esac
+
+ if test -n "$flag"; then
+ shared_link="${flag}${libdir}"
+ fi
+ else
# The "-lhdf5" & "-lhdf5_hl" flags are in here already...This is a static
# compile though, so change it to the static version (.a) of the library.
new_libraries=""