From f5384469b5306844d4d7645115b18126e34bacdf Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Thu, 19 Jan 2017 23:04:34 +0000 Subject: [PATCH] pass LDFLAGS fully into build Acked-by: John Johansen Signed-off-by: Tyler Hicks --- changehat/pam_apparmor/Makefile | 2 +- libraries/libapparmor/swig/perl/Makefile.PL.in | 1 + parser/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changehat/pam_apparmor/Makefile b/changehat/pam_apparmor/Makefile index 80303e6e2..be5e73c7b 100644 --- a/changehat/pam_apparmor/Makefile +++ b/changehat/pam_apparmor/Makefile @@ -55,7 +55,7 @@ libapparmor by adding USE_SYSTEM=1 to your make command.${nl}\ AA_LDLIBS = -lapparmor endif EXTRA_CFLAGS=$(CFLAGS) $(CPPFLAGS) -fPIC -shared -Wall $(LIBAPPARMOR_INCLUDE) -LINK_FLAGS=-Xlinker -x $(AA_LINK_FLAGS) +LINK_FLAGS=-Xlinker -x $(AA_LINK_FLAGS) $(LDFLAGS) LIBS=-lpam $(AA_LDLIBS) OBJECTS=${NAME}.o get_options.o diff --git a/libraries/libapparmor/swig/perl/Makefile.PL.in b/libraries/libapparmor/swig/perl/Makefile.PL.in index d3cc8295f..31a021b63 100644 --- a/libraries/libapparmor/swig/perl/Makefile.PL.in +++ b/libraries/libapparmor/swig/perl/Makefile.PL.in @@ -13,5 +13,6 @@ WriteMakefile( 'INC' => q[@CPPFLAGS@ -I@top_srcdir@/include @CFLAGS@], 'LIBS' => q[-L@top_builddir@/src/.libs/ -lapparmor @LIBS@], 'OBJECT' => 'libapparmor_wrap.o', # $(OBJ_EXT) + 'dynamic_lib' => { 'OTHERLDFLAGS' => q[@LDFLAGS@], }, ) ; diff --git a/parser/Makefile b/parser/Makefile index 670944198..ca2a44e4c 100644 --- a/parser/Makefile +++ b/parser/Makefile @@ -86,7 +86,7 @@ OBJECTS = $(patsubst %.cc, %.o, $(SRCS:.c=.o)) AAREDIR= libapparmor_re AAREOBJECT = ${AAREDIR}/libapparmor_re.a AAREOBJECTS = $(AAREOBJECT) -AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. +AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS) AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread ifdef USE_SYSTEM