[gomp4] Fix include path configury for gomp-constants.h
diff mbox

Message ID 20141017165117.03bccb6c@octopus
State New
Headers show

Commit Message

Julian Brown Oct. 17, 2014, 3:51 p.m. UTC
Hi,

This patch tweaks the include path configury used by libgomp to find
the gomp-constants.h header, as suggested by Jakub.

OK for the gomp4 branch?

Thanks,

Julian

    libgomp/
    * Makefile.am (AM_CPPFLAGS): Fix search path for locating
    gomp-constants.h.
    * Makefile.in: Regenerate.

Comments

Thomas Schwinge Oct. 20, 2014, 9:46 a.m. UTC | #1
Hi Julian!

On Fri, 17 Oct 2014 16:51:17 +0100, Julian Brown <julian@codesourcery.com> wrote:
> This patch tweaks the include path configury used by libgomp to find
> the gomp-constants.h header, as suggested by Jakub.
> 
> OK for the gomp4 branch?

Thanks, yes, with the following changed:

>     libgomp/
>     * Makefile.am (AM_CPPFLAGS): Fix search path for locating
>     gomp-constants.h.
>     * Makefile.in: Regenerate.

> --- a/libgomp/Makefile.am
> +++ b/libgomp/Makefile.am
> @@ -14,8 +14,7 @@ libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
>  
>  vpath % $(strip $(search_path))
>  
> -AM_CPPFLAGS = $(addprefix -I, $(search_path)) \
> -	$(addprefix -I, $(search_path)/../include)
> +AM_CPPFLAGS = $(addprefix -I, $(search_path)) -I $(top_srcdir)/../include

                                                   ^

No space here?


Grüße,
 Thomas

Patch
diff mbox

commit a682a91d68d3ffb1516a1589ef093e00151a6078
Author: Julian Brown <julian@codesourcery.com>
Date:   Wed Oct 15 02:12:07 2014 -0700

    Fix include path configury for gomp-constants.h.

diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am
index 7ddb0a4..77f71ee 100644
--- a/libgomp/Makefile.am
+++ b/libgomp/Makefile.am
@@ -14,8 +14,7 @@  libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 
 vpath % $(strip $(search_path))
 
-AM_CPPFLAGS = $(addprefix -I, $(search_path)) \
-	$(addprefix -I, $(search_path)/../include)
+AM_CPPFLAGS = $(addprefix -I, $(search_path)) -I $(top_srcdir)/../include
 AM_CFLAGS = $(XCFLAGS)
 AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS)
 
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 4965442..fdd18ff 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -333,9 +333,7 @@  gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir)
 fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude
 libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
-AM_CPPFLAGS = $(addprefix -I, $(search_path)) \
-	$(addprefix -I, $(search_path)/../include)
-
+AM_CPPFLAGS = $(addprefix -I, $(search_path)) -I $(top_srcdir)/../include
 AM_CFLAGS = $(XCFLAGS)
 AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS)
 toolexeclib_LTLIBRARIES = libgomp.la $(am__append_1) \