diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2024-03-16 03:42:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-16 03:42:21 (GMT) |
| commit | 844172a1e81fd614fa1efb32e2dcee469b740794 (patch) | |
| tree | 9cfe0eb3c73bf034b2637c8782c066f8d7a7ff0f /bin | |
| parent | 4320d92be6f2d4c945ebe2ce8d63a683d6642a96 (diff) | |
| parent | 6d85ea26abea85935af45081e8ef9d6e2a659171 (diff) | |
| download | hdf5-feature/new_datatypes.zip hdf5-feature/new_datatypes.tar.gz hdf5-feature/new_datatypes.tar.bz2 | |
Merge branch 'develop' into feature/new_datatypesfeature/new_datatypes
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/cmakehdf5 | 1 | ||||
| -rw-r--r-- | bin/h5cc.in | 42 |
2 files changed, 22 insertions, 21 deletions
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index 6d31b34..bdd724f 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -1,4 +1,5 @@ #!/bin/sh +echo "Deprecated: This will be removed in a future release" # Build and Test HDF5 using cmake. # Copyright: The HDF Group, 2012-14 diff --git a/bin/h5cc.in b/bin/h5cc.in index e4d4368..bb290df 100644 --- a/bin/h5cc.in +++ b/bin/h5cc.in @@ -327,27 +327,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="" |