diff options
Diffstat (limited to 'libmpx')
| -rw-r--r-- | libmpx/ChangeLog | 9 | ||||
| -rw-r--r-- | libmpx/Makefile.am | 2 | ||||
| -rw-r--r-- | libmpx/Makefile.in | 2 | ||||
| -rw-r--r-- | libmpx/configure | 3 | ||||
| -rw-r--r-- | libmpx/configure.ac | 3 |
5 files changed, 17 insertions, 2 deletions
diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog index 67ae96a..3bf0376 100644 --- a/libmpx/ChangeLog +++ b/libmpx/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. + 2016-12-27 H.J. Lu <hongjiu.lu@intel.com> Alexander Ivchenko <alexander.ivchenko@intel.com> diff --git a/libmpx/Makefile.am b/libmpx/Makefile.am index bd0a8b6..9ec6ec7 100644 --- a/libmpx/Makefile.am +++ b/libmpx/Makefile.am @@ -9,7 +9,7 @@ nodist_toolexeclib_HEADERS = libmpx.spec endif ## 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) # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and diff --git a/libmpx/Makefile.in b/libmpx/Makefile.in index d644af3..9b1d7a6 100644 --- a/libmpx/Makefile.in +++ b/libmpx/Makefile.in @@ -255,7 +255,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I .. -I ../config @LIBMPX_SUPPORTED_TRUE@SUBDIRS = mpxrt $(am__append_1) @LIBMPX_SUPPORTED_TRUE@nodist_toolexeclib_HEADERS = libmpx.spec -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and diff --git a/libmpx/configure b/libmpx/configure index 56461fc..115f53e 100644 --- a/libmpx/configure +++ b/libmpx/configure @@ -11585,6 +11585,9 @@ else multilib_arg= fi +# Determine what GCC version number to use in filesystem paths. +GCC_BASE_VER + ac_config_files="$ac_config_files Makefile libmpx.spec" ac_config_headers="$ac_config_headers config.h" diff --git a/libmpx/configure.ac b/libmpx/configure.ac index 18ba687..baa882b 100644 --- a/libmpx/configure.ac +++ b/libmpx/configure.ac @@ -125,6 +125,9 @@ else multilib_arg= fi +# Determine what GCC version number to use in filesystem paths. +GCC_BASE_VER + AC_CONFIG_FILES([Makefile libmpx.spec]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_FILES(AC_FOREACH([DIR], [mpxrt mpxwrap], [DIR/Makefile ]), |