diff options
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 7 | ||||
| -rw-r--r-- | libgomp/testsuite/Makefile.am | 2 | ||||
| -rw-r--r-- | libgomp/testsuite/Makefile.in | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index d1c1ae1bb91..806c4f2f2bd 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2017-01-21 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead + of cat to get version from BASE-VER file. + * testsuite/Makefile.in: Regenerated. + 2017-01-19 Jakub Jelinek <jakub@redhat.com> * plugin/cuda/cuda.h (CUdeviceptr): Typedef to unsigned long long even diff --git a/libgomp/testsuite/Makefile.am b/libgomp/testsuite/Makefile.am index 66a9d947e04..e2a3f460eb0 100644 --- a/libgomp/testsuite/Makefile.am +++ b/libgomp/testsuite/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in index 9a1305016c9..6edb7ae7ade 100644 --- a/libgomp/testsuite/Makefile.in +++ b/libgomp/testsuite/Makefile.in @@ -246,7 +246,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) |