diff options
| author | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-01-25 12:54:36 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-01-25 12:54:36 +0100 |
| commit | c48dc2cd119a58b14a588270b799acc5f5376fb9 (patch) | |
| tree | 883f389d84cdd21fa74413da753f0d2de9436fe2 /libhsail-rt/Makefile.am | |
| parent | 9aa483a2d87e2d1a5d976ddf9ecd6352d8eebf9e (diff) | |
re PR other/79046 (g++ -print-file-name=plugin uses full version number in path)
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_AMFLAGS): Set to -I .. -I ../config .
* aclocal.m4: Regenerated.
* configure: Regenerated.
* Makefile.in: Regenerated.
From-SVN: r244895
Diffstat (limited to 'libhsail-rt/Makefile.am')
| -rw-r--r-- | libhsail-rt/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libhsail-rt/Makefile.am b/libhsail-rt/Makefile.am index ef12df8bb44..e85427e3eab 100644 --- a/libhsail-rt/Makefile.am +++ b/libhsail-rt/Makefile.am @@ -44,13 +44,13 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) MAINT_CHARSET = latin1 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I .. -I ../config WARN_CFLAGS = $(WARN_FLAGS) $(WERROR) @@ -120,5 +120,3 @@ AM_MAKEFLAGS = \ "DESTDIR=$(DESTDIR)" MAKEOVERRIDES= - - |