diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2021-09-13 19:49:49 +0200 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2021-09-13 19:49:49 +0200 |
| commit | b18a97e5dd0935e1c4a626c230f21457d0aad3d5 (patch) | |
| tree | c1818f41af6fe780deafb6cd6a183f32085fe654 /zlib | |
| parent | e76a53644c9d70e998c0d050e9a456af388c6b61 (diff) | |
| download | gcc-b18a97e5dd0935e1c4a626c230f21457d0aad3d5.zip gcc-b18a97e5dd0935e1c4a626c230f21457d0aad3d5.tar.gz gcc-b18a97e5dd0935e1c4a626c230f21457d0aad3d5.tar.bz2 | |
Merged current trunk to branch.
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/ChangeLog | 4 | ||||
| -rwxr-xr-x | zlib/configure | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/zlib/ChangeLog b/zlib/ChangeLog index 8dfdc55..106dc97 100644 --- a/zlib/ChangeLog +++ b/zlib/ChangeLog @@ -1,3 +1,7 @@ +2021-01-05 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * configure: Re-generate. + 2020-12-05 Iain Sandoe <iain@sandoe.co.uk> PR target/97865 diff --git a/zlib/configure b/zlib/configure index 945a960..f489f31 100755 --- a/zlib/configure +++ b/zlib/configure @@ -9907,16 +9907,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - haiku*) version_type=linux need_lib_prefix=no @@ -10038,7 +10028,7 @@ linux*oldld* | linux*aout* | linux*coff*) # project, but have not yet been accepted: they are GCC-local changes # for the time being. (See # https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html) -linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi) version_type=linux need_lib_prefix=no need_version=no |