diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 9 | ||||
| -rw-r--r-- | libgfortran/Makefile.am | 2 | ||||
| -rw-r--r-- | libgfortran/Makefile.in | 3 | ||||
| -rwxr-xr-x | libgfortran/configure | 23 | ||||
| -rw-r--r-- | libgfortran/configure.ac | 3 |
5 files changed, 36 insertions, 4 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 1a687300a78..3335177eebe 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,12 @@ +2017-01-17 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * configure.ac: Add GCC_BASE_VER. + * Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to + get version from BASE-VER file. + * configure: Regenerated. + * Makefile.in: Regenerated. + 2017-01-13 Andre Vehreschild <vehre@gcc.gnu.org> PR fortran/70696 diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index fed875e1493..2857af5943f 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config ## May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) ## Symbol versioning (copied from libssp). if LIBGFOR_USE_SYMVER diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index b3b5611e25a..05b183dcadb 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -525,6 +525,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ extra_ldflags_libgfortran = @extra_ldflags_libgfortran@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -566,7 +567,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I .. -I ../config -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) @LIBGFOR_USE_SYMVER_FALSE@version_arg = @LIBGFOR_USE_SYMVER_GNU_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_arg = -Wl,--version-script=$(srcdir)/gfortran.map @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_arg = -Wl,-M,gfortran.map-sun diff --git a/libgfortran/configure b/libgfortran/configure index 4cc247e55b4..f975e2abc50 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -605,6 +605,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +get_gcc_base_ver IEEE_FLAGS IEEE_SUPPORT IEEE_SUPPORT_FALSE @@ -779,6 +780,7 @@ enable_fast_install enable_libtool_lock enable_largefile enable_libquadmath_support +with_gcc_major_version_only ' ac_precious_vars='build_alias host_alias @@ -1437,6 +1439,8 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] + --with-gcc-major-version-only + use only GCC major number in filesystem paths Some influential environment variables: CC C compiler command @@ -12417,7 +12421,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12420 "configure" +#line 12424 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12523,7 +12527,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12526 "configure" +#line 12530 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -26315,6 +26319,21 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" +# 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 + + + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac index 628f75d0367..66a84625e52 100644 --- a/libgfortran/configure.ac +++ b/libgfortran/configure.ac @@ -621,6 +621,9 @@ LIBGFOR_CHECK_AVX2 # Check wether we support AVX512f extensions LIBGFOR_CHECK_AVX512F +# Determine what GCC version number to use in filesystem paths. +GCC_BASE_VER + AC_CACHE_SAVE if test ${multilib} = yes; then |