Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Disable -Wl,-z,defs for ASAN builds 

Commit af65916 added -Wl,-z,defs for the shared libraries. This
apparently does not work in some cases with --enable-asan, so only add
it for non-ASAN builds.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: João Carlos Mendes Luis <jonny@jonny.eng.br>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10557
Closes #10560
This commit is contained in:
Joao Carlos Mendes Luis 2020-07-14 16:17:44 -03:00 committed by GitHub
parent e4d3d77684
commit 5f72109e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libnvpair/Makefile.am
View File

@ -31,7 +31,11 @@ libnvpair_la_LIBADD = \
libnvpair_la_LIBADD += $(LIBTIRPC_LIBS) $(LTLIBINTL) libnvpair_la_LIBADD += $(LIBTIRPC_LIBS) $(LTLIBINTL)
libnvpair_la_LDFLAGS = -Wl,-z,defs libnvpair_la_LDFLAGS =
if !ASAN_ENABLED
libnvpair_la_LDFLAGS += -Wl,-z,defs
endif
if BUILD_FREEBSD if BUILD_FREEBSD
libnvpair_la_LDFLAGS += -version-info 3:0:0 libnvpair_la_LDFLAGS += -version-info 3:0:0

6
lib/libuutil/Makefile.am
View File

@ -21,7 +21,11 @@ libuutil_la_LIBADD = \
libuutil_la_LIBADD += $(LTLIBINTL) libuutil_la_LIBADD += $(LTLIBINTL)
libuutil_la_LDFLAGS = -pthread -Wl,-z,defs libuutil_la_LDFLAGS = -pthread
if !ASAN_ENABLED
libuutil_la_LDFLAGS += -Wl,-z,defs
endif
if BUILD_FREEBSD if BUILD_FREEBSD
libuutil_la_LDFLAGS += -version-info 3:0:0 libuutil_la_LDFLAGS += -version-info 3:0:0

6
lib/libzfs/Makefile.am
View File

@ -76,7 +76,11 @@ libzfs_la_LIBADD = \
libzfs_la_LIBADD += -lm $(LIBCRYPTO_LIBS) $(ZLIB_LIBS) $(LTLIBINTL) libzfs_la_LIBADD += -lm $(LIBCRYPTO_LIBS) $(ZLIB_LIBS) $(LTLIBINTL)
libzfs_la_LDFLAGS = -pthread -Wl,-z,defs libzfs_la_LDFLAGS = -pthread
if !ASAN_ENABLED
libzfs_la_LDFLAGS += -Wl,-z,defs
endif
if BUILD_FREEBSD if BUILD_FREEBSD
libzfs_la_LIBADD += -lutil -lgeom libzfs_la_LIBADD += -lutil -lgeom

6
lib/libzfs_core/Makefile.am
View File

@ -15,7 +15,11 @@ libzfs_core_la_LIBADD = \
libzfs_core_la_LIBADD += $(LTLIBINTL) libzfs_core_la_LIBADD += $(LTLIBINTL)
libzfs_core_la_LDFLAGS = -pthread -Wl,-z,defs libzfs_core_la_LDFLAGS = -pthread
if !ASAN_ENABLED
libzfs_core_la_LDFLAGS += -Wl,-z,defs
endif
if BUILD_FREEBSD if BUILD_FREEBSD
libzfs_core_la_LIBADD += -lutil -lgeom libzfs_core_la_LIBADD += -lutil -lgeom

6
lib/libzpool/Makefile.am
View File

@ -210,7 +210,11 @@ libzpool_la_LIBADD = \
libzpool_la_LIBADD += $(LIBCLOCK_GETTIME) $(ZLIB_LIBS) -ldl libzpool_la_LIBADD += $(LIBCLOCK_GETTIME) $(ZLIB_LIBS) -ldl
libzpool_la_LDFLAGS = -pthread -Wl,-z,defs libzpool_la_LDFLAGS = -pthread
if !ASAN_ENABLED
libzpool_la_LDFLAGS += -Wl,-z,defs
endif
if BUILD_FREEBSD if BUILD_FREEBSD
libzpool_la_LIBADD += -lgeom libzpool_la_LIBADD += -lgeom