diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2023-04-26 10:31:35 +0200 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 18:34:16 +0100 |
| commit | 71180a9eed367667e7b2c3f6aea1ee1bba15e9b3 (patch) | |
| tree | af65568fb07413cdbbbbf01b6ae04adb0c3729cf /libgrust | |
| parent | b1a8cb2fbf63f9579c96e26fdac3ce611461c58b (diff) | |
| download | gcc-71180a9eed367667e7b2c3f6aea1ee1bba15e9b3.zip gcc-71180a9eed367667e7b2c3f6aea1ee1bba15e9b3.tar.gz gcc-71180a9eed367667e7b2c3f6aea1ee1bba15e9b3.tar.bz2 | |
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 <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'libgrust')
| -rw-r--r-- | libgrust/Makefile.am | 6 | ||||
| -rw-r--r-- | libgrust/Makefile.in | 3 | ||||
| -rw-r--r-- | libgrust/libproc_macro/Makefile.am | 7 | ||||
| -rw-r--r-- | libgrust/libproc_macro/Makefile.in | 2 |
4 files changed, 5 insertions, 13 deletions
diff --git a/libgrust/Makefile.am b/libgrust/Makefile.am index e136863..38ee48a 100644 --- a/libgrust/Makefile.am +++ b/libgrust/Makefile.am @@ -11,9 +11,6 @@ TOP_GCCDIR := $(shell cd $(top_srcdir) && cd .. && pwd) GCC_DIR = $(TOP_GCCDIR)/gcc RUST_SRC = $(GCC_DIR)/rust -toolexeclibdir=@toolexeclibdir@ -toolexecdir=@toolexecdir@ - SUBDIRS = libproc_macro RUST_BUILDDIR := $(shell pwd) @@ -62,7 +59,6 @@ AM_MAKEFLAGS = \ "DESTDIR=$(DESTDIR)" \ "WERROR=$(WERROR)" \ "TARGET_LIB_PATH=$(TARGET_LIB_PATH)" \ - "TARGET_LIB_PATH_libgrust=$(TARGET_LIB_PATH_libgrust)" \ - "LIBTOOL=$(RUST_BUILDDIR)/libtool" + "TARGET_LIB_PATH_librust=$(TARGET_LIB_PATH_librust)" include $(top_srcdir)/../multilib.am diff --git a/libgrust/Makefile.in b/libgrust/Makefile.in index bcf0aa0..e9a410b 100644 --- a/libgrust/Makefile.in +++ b/libgrust/Makefile.in @@ -355,8 +355,7 @@ AM_MAKEFLAGS = \ "DESTDIR=$(DESTDIR)" \ "WERROR=$(WERROR)" \ "TARGET_LIB_PATH=$(TARGET_LIB_PATH)" \ - "TARGET_LIB_PATH_libgrust=$(TARGET_LIB_PATH_libgrust)" \ - "LIBTOOL=$(RUST_BUILDDIR)/libtool" + "TARGET_LIB_PATH_librust=$(TARGET_LIB_PATH_librust)" MULTISRCTOP = MULTIBUILDTOP = 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 |