Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
This commit is contained in:
commit
2d2164ab80
|
@ -25,4 +25,4 @@ zfs_LDADD = \
|
||||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||||
$(top_builddir)/lib/libzfs/libzfs.la
|
$(top_builddir)/lib/libzfs/libzfs.la
|
||||||
|
|
||||||
zfs_LDFLAGS = -pthread
|
zfs_LDFLAGS = -pthread -lm
|
||||||
|
|
|
@ -16,5 +16,4 @@ ztest_LDADD = \
|
||||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||||
$(top_builddir)/lib/libzfs/libzfs.la
|
$(top_builddir)/lib/libzfs/libzfs.la
|
||||||
|
|
||||||
ztest_LDFLAGS = -pthread
|
ztest_LDFLAGS = -pthread -lm
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue