diff options
| author | Richard Biener <rguenther@suse.de> | 2023-01-19 12:15:14 +0100 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2023-01-19 14:47:59 +0100 |
| commit | 1cfaaa42296298ea2d2b22a93d3c8c17104e6cd3 (patch) | |
| tree | 5886396635b2553c133385a93bffc273d645a07d /libgm2/libm2iso | |
| parent | 05b9868b182bb9ed2013b39a0bc6297354a0db49 (diff) | |
| download | gcc-1cfaaa42296298ea2d2b22a93d3c8c17104e6cd3.tar.gz | |
modula2/108144 - fix --enable-version-specific-runtime-libs
The following fixes --enable-version-specific-runtime-libs for
the modula2 target libraries. The issue is that the install
happens via for example
toolexeclib_LTLIBRARIES = libm2cor.la
and toolexeclibdir is set to $(toolexecdir)/$(gcc_version)$(MULTISUBDIR)
but the Makefile.am do not define $(gcc_version) but instead
$(version) which is used locally to define libsubdir. The fix
is to consistently define and use $(gcc_version), also properly
supporting --with-gcc-major-version-only
PR modula2/108144
libgm2/
* configure.ac: Add GCC_BASE_VER.
* configure: Re-generate.
* Makefile.am: Use @get_gcc_base_ver@ for gcc_version.
* libm2cor/Makefile.am: Likewise. Use gcc_version instead
of version.
* libm2iso/Makefile.am: Likewise.
* libm2log/Makefile.am: Likewise.
* libm2min/Makefile.am: Likewise.
* libm2pim/Makefile.am: Likewise.
* Makefile.in: Re-generate.
* libm2cor/Makefile.in: Likewise.
* libm2iso/Makefile.in: Likewise.
* libm2log/Makefile.in: Likewise.
* libm2min/Makefile.in: Likewise.
* libm2pim/Makefile.in: Likewise.
Diffstat (limited to 'libgm2/libm2iso')
| -rw-r--r-- | libgm2/libm2iso/Makefile.am | 4 | ||||
| -rw-r--r-- | libgm2/libm2iso/Makefile.in | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index fc0e4f5bd1a..90917bbba7b 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -24,10 +24,10 @@ VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-iso # Multilib support. MAKEOVERRIDES= -version := $(shell $(CC) -dumpversion) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) # Directory in which the compiler finds libraries etc. -libsubdir = $(libdir)/gcc/$(target_alias)/$(version) +libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version) # Used to install the shared libgcc. # was slibdir = @slibdir@ slibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index e628dd33631..fe77b9d3697 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -364,6 +364,7 @@ dvidir = @dvidir@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -412,10 +413,10 @@ ACLOCAL_AMFLAGS = -I . -I .. -I ../config # Multilib support. MAKEOVERRIDES = -version := $(shell $(CC) -dumpversion) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) # Directory in which the compiler finds libraries etc. -libsubdir = $(libdir)/gcc/$(target_alias)/$(version) +libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version) MULTIDIR := $(shell $(CC) $(CFLAGS) -print-multi-directory) MULTIOSDIR := $(shell $(CC) $(CFLAGS) -print-multi-os-directory) MULTIOSSUBDIR := $(shell if test x$(MULTIOSDIR) != x.; then echo /$(MULTIOSDIR); fi) |