44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
|
--- systemd-210/Makefile.am
|
||
|
|
+++ systemd-210/Makefile.am 2014-03-13 08:54:36.010736086 +0000
|
||
|
|
@@ -3691,6 +3691,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 \
|
||
|
|
--- systemd-210/Makefile.in
|
||
|
|
+++ systemd-210/Makefile.in 2014-03-13 09:19:48.950238725 +0000
|
||
|
|
@@ -8964,7 +8964,7 @@ src/cryptsetup/systemd_cryptsetup-crypts
|
||
|
|
|
||
|
|
systemd-cryptsetup$(EXEEXT): $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_DEPENDENCIES) $(EXTRA_systemd_cryptsetup_DEPENDENCIES)
|
||
|
|
@rm -f systemd-cryptsetup$(EXEEXT)
|
||
|
|
- $(AM_V_CCLD)$(systemd_cryptsetup_LINK) $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_LDADD) $(LIBS)
|
||
|
|
+ $(AM_V_CCLD)$(systemd_cryptsetup_LINK) $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_LDFLAGS) $(systemd_cryptsetup_LDADD) $(LIBS)
|
||
|
|
src/cryptsetup/cryptsetup-generator.$(OBJEXT): \
|
||
|
|
src/cryptsetup/$(am__dirstamp) \
|
||
|
|
src/cryptsetup/$(DEPDIR)/$(am__dirstamp)
|
||
|
|
--- systemd-210/configure.ac
|
||
|
|
+++ systemd-210/configure.ac 2014-03-13 13:46:24.394235954 +0000
|
||
|
|
@@ -151,16 +151,11 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CF
|
||
|
|
-fno-common \
|
||
|
|
-fdiagnostics-show-option \
|
||
|
|
-fdiagnostics-color \
|
||
|
|
- -fno-strict-aliasing \
|
||
|
|
-fvisibility=hidden \
|
||
|
|
-ffunction-sections \
|
||
|
|
-fdata-sections \
|
||
|
|
-fstack-protector \
|
||
|
|
--param=ssp-buffer-size=4])
|
||
|
|
-AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
|
||
|
|
- [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
|
||
|
|
- -flto])],
|
||
|
|
- [AC_MSG_RESULT([skipping -flto, optimization not enabled])])
|
||
|
|
AC_SUBST([OUR_CFLAGS], "$with_cflags $address_sanitizer_cflags")
|
||
|
|
|
||
|
|
AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
|