mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-08-22 10:07:12 +00:00
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 <steve@nxnw.org> Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
parent
99a58c93d3
commit
b216d488f9
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user