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

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index aa0f94e466a2340372550d3885dc9773f35de331..94bcedf489460de948ca1ec9663f4ca044fb1fa6 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -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.

diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am
index 4090336a773f8a8d1a4cc2367be516be0f27d1e4..042ed6f890fb7847ce800f668f0c78a618964148 100644 (file)
--- a/libgomp/Makefile.am
+++ b/libgomp/Makefile.am
@@ -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))

diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 92c087fbdec892dff6542db440f479d7094b3c6a..9fb2d007cb0156f2f35fb344bcabd0394f9edd08 100644 (file)
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -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)