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 /cmd | |
| 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 'cmd')
| -rw-r--r-- | cmd/mount_zfs/Makefile.am | 1 | ||||
| -rw-r--r-- | cmd/raidz_test/Makefile.am | 1 | ||||
| -rw-r--r-- | cmd/zed/Makefile.am | 1 | ||||
| -rw-r--r-- | cmd/zinject/Makefile.am | 1 | ||||
| -rw-r--r-- | cmd/zpool/Makefile.am | 1 | ||||
| -rw-r--r-- | cmd/zstream/Makefile.am | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am index 1ffeef7fe..ddacf32c6 100644 --- a/cmd/mount_zfs/Makefile.am +++ b/cmd/mount_zfs/Makefile.am @@ -14,4 +14,5 @@ mount_zfs_SOURCES = \ mount_zfs_LDADD = \ $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libzfs_core/libzfs_core.la \ $(top_builddir)/lib/libzfs/libzfs.la diff --git a/cmd/raidz_test/Makefile.am b/cmd/raidz_test/Makefile.am index c04d101b8..0b173ed50 100644 --- a/cmd/raidz_test/Makefile.am +++ b/cmd/raidz_test/Makefile.am @@ -14,6 +14,7 @@ raidz_test_SOURCES = \ raidz_bench.c raidz_test_LDADD = \ + $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libzpool/libzpool.la raidz_test_LDADD += -lm -ldl diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am index 40c0834af..82b000ce1 100644 --- a/cmd/zed/Makefile.am +++ b/cmd/zed/Makefile.am @@ -38,6 +38,7 @@ zed_SOURCES = $(ZED_SRC) $(FMA_SRC) zed_LDADD = \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la \ + $(top_builddir)/lib/libzfs_core/libzfs_core.la \ $(top_builddir)/lib/libzfs/libzfs.la zed_LDADD += -lrt diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am index 71b48255e..b056a6db5 100644 --- a/cmd/zinject/Makefile.am +++ b/cmd/zinject/Makefile.am @@ -9,4 +9,5 @@ zinject_SOURCES = \ zinject_LDADD = \ $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libzfs_core/libzfs_core.la \ $(top_builddir)/lib/libzfs/libzfs.la diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am index 7b25726f4..5efa13184 100644 --- a/cmd/zpool/Makefile.am +++ b/cmd/zpool/Makefile.am @@ -22,6 +22,7 @@ endif zpool_LDADD = \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la \ + $(top_builddir)/lib/libzfs_core/libzfs_core.la \ $(top_builddir)/lib/libzfs/libzfs.la if BUILD_FREEBSD diff --git a/cmd/zstream/Makefile.am b/cmd/zstream/Makefile.am index 892e15830..ebc07d2ea 100644 --- a/cmd/zstream/Makefile.am +++ b/cmd/zstream/Makefile.am @@ -10,4 +10,5 @@ zstream_SOURCES = \ zstream_LDADD = \ $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libzfs_core/libzfs_core.la \ $(top_builddir)/lib/libzfs/libzfs.la |