re PR libgomp/60670 (omp.h may differ between multilibs)

PR libgomp/60670
	* Makefile.am: Make fincludedir multilib-aware.
	* Makefile.in: Regenerate.

From-SVN: r244239
This commit is contained in:
Francois-Xavier Coudert 2017-01-09 20:29:06 +00:00 committed by François-Xavier Coudert
parent cb330ba582
commit c508bc2d52
3 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2017-01-09 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR libgomp/60670
* Makefile.am: Make fincludedir multilib-aware.
* Makefile.in: Regenerate.
2017-01-01 Jakub Jelinek <jakub@redhat.com>
Update copyright years.

View File

@ -10,7 +10,7 @@ config_path = @config_path@
search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
$(top_srcdir)/../include
fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude
fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
vpath % $(strip $(search_path))

View File

@ -405,7 +405,7 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
$(top_srcdir)/../include
fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude
fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
AM_CPPFLAGS = $(addprefix -I, $(search_path))
AM_CFLAGS = $(XCFLAGS)