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/configure | |
| parent | 05b9868b182bb9ed2013b39a0bc6297354a0db49 (diff) | |
| download | gcc-1cfaaa42296298ea2d2b22a93d3c8c17104e6cd3.zip gcc-1cfaaa42296298ea2d2b22a93d3c8c17104e6cd3.tar.gz gcc-1cfaaa42296298ea2d2b22a93d3c8c17104e6cd3.tar.bz2 | |
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/configure')
| -rwxr-xr-x | libgm2/configure | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/libgm2/configure b/libgm2/configure index 922b071..8b2c28c 100755 --- a/libgm2/configure +++ b/libgm2/configure @@ -634,6 +634,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +get_gcc_base_ver TARGET_DARWIN_FALSE TARGET_DARWIN_TRUE BUILD_LOGLIB_FALSE @@ -805,6 +806,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +with_gcc_major_version_only ' ac_precious_vars='build_alias host_alias @@ -1464,6 +1466,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-gcc-major-version-only + use only GCC major number in filesystem paths Some influential environment variables: CC C compiler command @@ -12700,7 +12704,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12703 "configure" +#line 12707 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12806,7 +12810,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12809 "configure" +#line 12813 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19696,6 +19700,21 @@ else fi +# Determine what GCC version number to use in filesystem paths. + + get_gcc_base_ver="cat" + +# Check whether --with-gcc-major-version-only was given. +if test "${with_gcc_major_version_only+set}" = set; then : + withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*/\1/'" + fi + +fi + + + + ac_config_files="$ac_config_files Makefile libm2min/Makefile libm2pim/Makefile libm2iso/Makefile libm2cor/Makefile libm2log/Makefile" |