diff options
| -rw-r--r-- | libgomp/ChangeLog | 6 | ||||
| -rw-r--r-- | libgomp/Makefile.am | 2 | ||||
| -rw-r--r-- | libgomp/Makefile.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index aa0f94e..94bcedf 100644 --- 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 4090336..042ed6f 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 92c087f..9fb2d00 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) |