mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-28 04:47:53 +00:00
Code Issues Releases Wiki Activity

parser - remove hackish way of getting a static libstdc++

Browse Source 
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 <steve@nxnw.org>
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Steve Beattie 2013-10-15 16:50:42 -07:00
parent 99a58c93d3
commit b216d488f9
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
parser/Makefile
View File

@ -86,8 +86,8 @@ OBJECTS = $(SRCS:.c=.o)
AAREDIR= libapparmor_re AAREDIR= libapparmor_re
AAREOBJECT = ${AAREDIR}/libapparmor_re.a AAREOBJECT = ${AAREDIR}/libapparmor_re.a
AAREOBJECTS = $(AAREOBJECT) libstdc++.a AAREOBJECTS = $(AAREOBJECT)
AARE_LDFLAGS=-static-libgcc -L. -L$(LIBAPPARMOR_LDPATH) AARE_LDFLAGS=-static-libgcc -static-libstdc++ -L. -L$(LIBAPPARMOR_LDPATH)
AALIB = -lapparmor AALIB = -lapparmor
LEX_C_FILES = parser_lex.c LEX_C_FILES = parser_lex.c
@ -150,11 +150,6 @@ indep: docs
all: arch indep all: arch indep
.PHONY: libstdc++.a
libstdc++.a:
rm -f ./libstdc++.a
ln -s `$(CXX) -print-file-name=libstdc++.a`
apparmor_parser: $(OBJECTS) $(AAREOBJECTS) apparmor_parser: $(OBJECTS) $(AAREOBJECTS)
$(CXX) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \ $(CXX) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
${LEXLIB} $(AAREOBJECTS) $(AARE_LDFLAGS) $(AALIB) ${LEXLIB} $(AAREOBJECTS) $(AARE_LDFLAGS) $(AALIB)