From 71180a9eed367667e7b2c3f6aea1ee1bba15e9b3 Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Wed, 26 Apr 2023 10:31:35 +0200 Subject: gccrs: libproc_macro: Build statically We do not need dynamic linking, all use case of this library cover can be done statically hence the change. gcc/rust/ChangeLog: * Make-lang.in: Link against the static libproc_macro. libgrust/ChangeLog: * Makefile.am: Remove libtool forwarding. * Makefile.in: Regenerate. * libproc_macro/Makefile.am: Creates an archive instead of using libtool. * libproc_macro/Makefile.in: Regenerate. Signed-off-by: Pierre-Emmanuel Patry --- libgrust/libproc_macro/Makefile.am | 7 ++----- libgrust/libproc_macro/Makefile.in | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'libgrust/libproc_macro') diff --git a/libgrust/libproc_macro/Makefile.am b/libgrust/libproc_macro/Makefile.am index e714362..0fe2211 100644 --- a/libgrust/libproc_macro/Makefile.am +++ b/libgrust/libproc_macro/Makefile.am @@ -2,7 +2,7 @@ SUFFIXES = .cc .o .a .lo .la ACLOCAL_AMFLAGS = -I .. -I ../../config -AR=@AR@ +AR = @AR@ AR_FLAGS = rc # Work around what appears to be a GNU make bug handling MAKEFLAGS @@ -48,13 +48,11 @@ AM_MAKEFLAGS = \ "TARGET_LIB_PATH=$(TARGET_LIB_PATH)" TARGETLIB = ./libproc_macro.a - LIBOBJS = @LIBOBJS@ - objext = @OBJEXT@ REQUIRED_OFILES = \ - ./proc_macro.$(objext) + ./proc_macro.$(objext) ./literal.$(objext) ./group.$(objext) ./ident.$(objext) ./punct.$(objext) ./tokenstream.$(objext) ./tokentree.$(objext) all: $(TARGETLIB) @@ -62,4 +60,3 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(LIBOBJS) -rm -f $(TARGETLIB) $(AR) $(AR_FLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) - diff --git a/libgrust/libproc_macro/Makefile.in b/libgrust/libproc_macro/Makefile.in index 9ff1dd6..6eb5365 100644 --- a/libgrust/libproc_macro/Makefile.in +++ b/libgrust/libproc_macro/Makefile.in @@ -311,7 +311,7 @@ AM_MAKEFLAGS = \ TARGETLIB = ./libproc_macro.a objext = @OBJEXT@ REQUIRED_OFILES = \ - ./proc_macro.$(objext) + ./proc_macro.$(objext) ./literal.$(objext) ./group.$(objext) ./ident.$(objext) ./punct.$(objext) ./tokenstream.$(objext) ./tokentree.$(objext) all: all-am -- cgit v1.1