luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'meson-unused-zlib-libname' into 'master'

Browse Source 
Meson: Remove unused zlib_libname variable

See merge request GNOME/glib!61
This commit is contained in:
Christoph Reiter 2018-06-05 15:37:57 +00:00
commit 0a36314b28
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@ -1667,7 +1667,6 @@ endif
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)
libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep']) libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep'])
zlib_libname = '-lz'
if cc.get_id() != 'msvc' if cc.get_id() != 'msvc'
libz_dep = dependency('zlib', fallback : ['zlib', 'zlib_dep']) libz_dep = dependency('zlib', fallback : ['zlib', 'zlib_dep'])
else else
@ -1679,13 +1678,9 @@ else
# of using ZLib's win32/makefile.msc. # of using ZLib's win32/makefile.msc.
if not libz_dep.found() if not libz_dep.found()
libz_dep = cc.find_library('zlib1', required : false) libz_dep = cc.find_library('zlib1', required : false)
if libz_dep.found() if not libz_dep.found()
zlib_libname = '-lzlib1'
else
libz_dep = cc.find_library('zlib', required : false) libz_dep = cc.find_library('zlib', required : false)
if libz_dep.found() if not libz_dep.found()
zlib_libname = '-lzlib'
else
libz_dep = subproject('zlib').get_variable('zlib_dep') libz_dep = subproject('zlib').get_variable('zlib_dep')
endif endif
endif endif