---
 Makefile.am  |    4 ++++
 configure.ac |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: systemd/Makefile.am
===================================================================
--- systemd.orig/Makefile.am
+++ systemd/Makefile.am
@@ -4789,6 +4789,10 @@ systemd_cryptsetup_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(LIBCRYPTSETUP_CFLAGS)
 
+systemd_cryptsetup_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-Wl,-rpath-link=$(top_srcdir)/.libs
+
 systemd_cryptsetup_LDADD = \
 	libsystemd-label.la \
 	libudev-internal.la \
Index: systemd/configure.ac
===================================================================
--- systemd.orig/configure.ac
+++ systemd/configure.ac
@@ -206,10 +206,6 @@ AS_CASE([$CC], [*clang*],
                -Wno-gnu-variable-sized-type-not-at-end \
         ])])
 
-AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
-        [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
-               -flto -ffat-lto-objects])],
-        [AC_MSG_RESULT([skipping -flto, optimization not enabled])])
 AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags")
 
 AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],