From c508bc2d525e8223fba0714bf6ed42c7bdeb75a9 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Mon, 9 Jan 2017 20:29:06 +0000 Subject: [PATCH] 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 --- libgomp/ChangeLog | 6 ++++++ libgomp/Makefile.am | 2 +- libgomp/Makefile.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index aa0f94e466a..94bcedf4894 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2017-01-09 Francois-Xavier Coudert + + PR libgomp/60670 + * Makefile.am: Make fincludedir multilib-aware. + * Makefile.in: Regenerate. + 2017-01-01 Jakub Jelinek Update copyright years. diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index 4090336a773..042ed6f890f 100644 --- 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 92c087fbdec..9fb2d007cb0 100644 --- 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) -- 2.30.2