From b216d488f9f794a56ad329b5718f8b43fa08db32 Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Tue, 15 Oct 2013 16:50:42 -0700 Subject: [PATCH] parser - remove hackish way of getting a static libstdc++ This patch switches over from using our hackish way to get a statically linked libstdc++ (which was based on the article at http://www.trilithium.com/johan/2005/06/static-libstdc/) with the -static-libstdc++ compiler option Signed-off-by: Steve Beattie Acked-by: John Johansen --- parser/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/parser/Makefile b/parser/Makefile index 428ebd600..e0482b83d 100644 --- a/parser/Makefile +++ b/parser/Makefile @@ -86,8 +86,8 @@ OBJECTS = $(SRCS:.c=.o) AAREDIR= libapparmor_re AAREOBJECT = ${AAREDIR}/libapparmor_re.a -AAREOBJECTS = $(AAREOBJECT) libstdc++.a -AARE_LDFLAGS=-static-libgcc -L. -L$(LIBAPPARMOR_LDPATH) +AAREOBJECTS = $(AAREOBJECT) +AARE_LDFLAGS=-static-libgcc -static-libstdc++ -L. -L$(LIBAPPARMOR_LDPATH) AALIB = -lapparmor LEX_C_FILES = parser_lex.c @@ -150,11 +150,6 @@ indep: docs all: arch indep -.PHONY: libstdc++.a -libstdc++.a: - rm -f ./libstdc++.a - ln -s `$(CXX) -print-file-name=libstdc++.a` - apparmor_parser: $(OBJECTS) $(AAREOBJECTS) $(CXX) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \ ${LEXLIB} $(AAREOBJECTS) $(AARE_LDFLAGS) $(AALIB)