diff options
Diffstat (limited to 'liboffloadmic')
-rw-r--r-- | liboffloadmic/ChangeLog | 10 | ||||
-rw-r--r-- | liboffloadmic/Makefile.am | 2 | ||||
-rw-r--r-- | liboffloadmic/Makefile.in | 10 | ||||
-rw-r--r-- | liboffloadmic/aclocal.m4 | 1 | ||||
-rw-r--r-- | liboffloadmic/configure | 25 | ||||
-rw-r--r-- | liboffloadmic/configure.ac | 3 |
6 files changed, 43 insertions, 8 deletions
diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog index 3323bd6535d..4960f5637e8 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,13 @@ +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. + * aclocal.m4: Include ../config/acx.m4. + * configure: Regenerated. + * Makefile.in: Regenerated. + 2016-11-15 Matthias Klose <doko@ubuntu.com> * configure: Regenerate. diff --git a/liboffloadmic/Makefile.am b/liboffloadmic/Makefile.am index c0cf645fdd7..b9a0bdee37e 100644 --- a/liboffloadmic/Makefile.am +++ b/liboffloadmic/Makefile.am @@ -41,7 +41,7 @@ libgomp_dir = $(build_dir)/../libgomp source_dir = $(top_srcdir)/runtime # 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) libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include # Target list. diff --git a/liboffloadmic/Makefile.in b/liboffloadmic/Makefile.in index 07727d27331..591b3c90ebb 100644 --- a/liboffloadmic/Makefile.in +++ b/liboffloadmic/Makefile.in @@ -93,9 +93,10 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/acx.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ + $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -336,6 +337,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -388,7 +390,7 @@ libgomp_dir = $(build_dir)/../libgomp source_dir = $(top_srcdir)/runtime # 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) libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include @LIBOFFLOADMIC_HOST_FALSE@nodist_toolexeclib_HEADERS = liboffloadmic_target.spec diff --git a/liboffloadmic/aclocal.m4 b/liboffloadmic/aclocal.m4 index a46868106ba..71023b2c723 100644 --- a/liboffloadmic/aclocal.m4 +++ b/liboffloadmic/aclocal.m4 @@ -992,6 +992,7 @@ m4_include([../config/depstand.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/multi.m4]) m4_include([../config/override.m4]) +m4_include([../config/acx.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) diff --git a/liboffloadmic/configure b/liboffloadmic/configure index ebb60f6cffb..e22b214ddbc 100644 --- a/liboffloadmic/configure +++ b/liboffloadmic/configure @@ -602,6 +602,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +get_gcc_base_ver link_offloadmic_target link_offloadmic_host lt_cv_dlopen_libs @@ -744,6 +745,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +with_gcc_major_version_only ' ac_precious_vars='build_alias host_alias @@ -1398,6 +1400,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 @@ -11104,7 +11108,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11107 "configure" +#line 11111 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11210,7 +11214,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11213 "configure" +#line 11217 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14481,6 +14485,21 @@ 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 + + + + # Must be last cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -17075,7 +17094,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ac_sub_configure=$ac_srcdir/configure.gnu elif test -f "$ac_srcdir/configure"; then ac_sub_configure=$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.ac"; then + elif test -f "$ac_srcdir/configure.in"; then # This should be Cygnus configure. ac_sub_configure=$ac_aux_dir/configure else diff --git a/liboffloadmic/configure.ac b/liboffloadmic/configure.ac index 81fae8f9441..64728f1a1a7 100644 --- a/liboffloadmic/configure.ac +++ b/liboffloadmic/configure.ac @@ -128,5 +128,8 @@ fi AC_SUBST(link_offloadmic_host) AC_SUBST(link_offloadmic_target) +# Determine what GCC version number to use in filesystem paths. +GCC_BASE_VER + # Must be last AC_OUTPUT |