build-sys: Link with -ldl for rust build
authorColin Walters <walters@verbum.org>
Tue, 2 Jan 2018 14:54:52 +0000 (09:54 -0500)
committerAtomic Bot <atomic-devel@projectatomic.io>
Thu, 4 Jan 2018 12:23:06 +0000 (12:23 +0000)
I didn't dive into this too much, it looks like something in rust changed that
broke our build. Probably libstd gained a dependency on `-ldl` or so, and that's
handled by cargo? Anyways linking against it isn't going to hurt.

Closes: #1391
Approved by: smcv

Makefile-libostree.am

index 0a4de6de170b4fa61af88aa398ea8c96150711ec..19f8184e3825a06a011dd38a863f125b3c28f0ba 100644 (file)
@@ -202,6 +202,10 @@ libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/bsdiff -I$(srcdir)/libglnx -I$(
 libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions $(addprefix $(wl_versionscript_arg),$(symbol_files))
 libostree_1_la_LIBADD = libotutil.la libglnx.la libbsdiff.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) \
                         $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS) $(OT_DEP_CRYPTO_LIBS)
+# Some change between rust-1.21.0-1.fc27 and rust-1.22.1-1.fc27.x86_64
+if ENABLE_RUST
+libostree_1_la_LIBADD += -ldl
+endif
 libostree_1_la_LIBADD += $(bupsplitpath)
 EXTRA_libostree_1_la_DEPENDENCIES = $(symbol_files)