diff options
author | Petros Koutoupis <[email protected]> | 2020-05-09 12:17:08 -0500 |
---|---|---|
committer | GitHub <[email protected]> | 2020-05-09 10:17:08 -0700 |
commit | bd95f00d4b6aa185bf508f12d2cdbfbb2350b80e (patch) | |
tree | 91406e6f17adb10a51c178479c232719cedad692 /tests | |
parent | d775c86dd4ced233ac0636607706cc5a08bcb923 (diff) |
Fixed LDADD library links in Makefiles for cross compilation builds
When building on native dev system, there are no issues but when
cross-compiling for target system, some linker errors are observed.
The only way to avoid these errors is by adjusting the Makefile.am
of those various components to add the library dependencies.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Petros Koutoupis <[email protected]>
Closes #10304
Diffstat (limited to 'tests')
-rw-r--r-- | tests/zfs-tests/cmd/btree_test/Makefile.am | 1 | ||||
-rw-r--r-- | tests/zfs-tests/tests/functional/hkdf/Makefile.am | 4 | ||||
-rw-r--r-- | tests/zfs-tests/tests/functional/libzfs/Makefile.am | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/tests/zfs-tests/cmd/btree_test/Makefile.am b/tests/zfs-tests/cmd/btree_test/Makefile.am index 632f04726..bf09cdb82 100644 --- a/tests/zfs-tests/cmd/btree_test/Makefile.am +++ b/tests/zfs-tests/cmd/btree_test/Makefile.am @@ -29,4 +29,5 @@ btree_test_SOURCES = btree_test.c btree_test_LDADD = \ $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libzpool/libzpool.la diff --git a/tests/zfs-tests/tests/functional/hkdf/Makefile.am b/tests/zfs-tests/tests/functional/hkdf/Makefile.am index c1266214f..378bcf531 100644 --- a/tests/zfs-tests/tests/functional/hkdf/Makefile.am +++ b/tests/zfs-tests/tests/functional/hkdf/Makefile.am @@ -1,6 +1,8 @@ include $(top_srcdir)/config/Rules.am -LDADD = $(top_builddir)/lib/libzpool/libzpool.la +LDADD = \ + $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libzpool/libzpool.la AUTOMAKE_OPTIONS = subdir-objects diff --git a/tests/zfs-tests/tests/functional/libzfs/Makefile.am b/tests/zfs-tests/tests/functional/libzfs/Makefile.am index e9a703f49..545af77e7 100644 --- a/tests/zfs-tests/tests/functional/libzfs/Makefile.am +++ b/tests/zfs-tests/tests/functional/libzfs/Makefile.am @@ -10,6 +10,8 @@ dist_pkgdata_SCRIPTS = \ libzfs_input.ksh many_fds_LDADD = \ + $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libzfs_core/libzfs_core.la \ $(top_builddir)/lib/libzfs/libzfs.la pkgexec_PROGRAMS = many_fds |