This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Fix computation of CXX_FOR_TARGET so that it can detect an in-tree xg++ executable.
- From: Nick Clifton <nickc at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 18 Feb 2016 10:11:18 -0000
- Subject: [binutils-gdb] Fix computation of CXX_FOR_TARGET so that it can detect an in-tree xg++ executable.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=06ea285dcbfb67189e46bee7f4f7c9b4140fc681
commit 06ea285dcbfb67189e46bee7f4f7c9b4140fc681
Author: Nick Clifton <nickc@redhat.com>
Date: Thu Feb 18 10:10:36 2016 +0000
Fix computation of CXX_FOR_TARGET so that it can detect an in-tree xg++ executable.
* Makefile.am (CXX_FOR_TARGET): Check for the presence of an
in-tree xg++ executable after checking for the presence of an
in-tree g++ executable.
* Makefile.in: Regenerate.
Diff:
---
ld/ChangeLog | 7 +++++++
ld/Makefile.am | 6 ++++++
ld/Makefile.in | 6 ++++++
3 files changed, 19 insertions(+)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index dbaf837..badac37 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-18 Nick Clifton <nickc@redhat.com>
+
+ * Makefile.am (CXX_FOR_TARGET): Check for the presence of an
+ in-tree xg++ executable after checking for the presence of an
+ in-tree g++ executable.
+ * Makefile.in: Regenerate.
+
2016-02-17 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/ld-ifunc/ifunc-1-local-x86.d: Updated.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 8bfd318..818af5a 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -122,6 +122,12 @@ CXX_FOR_TARGET = ` \
else \
echo $$r/../gcc/g++ -B$$r/../gcc/; \
fi; \
+ elif [ -f $$r/../gcc/xg++ ] ; then \
+ if [ -f $$r/../newlib/Makefile ] ; then \
+ echo $$r/../gcc/xg++ -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
+ else \
+ echo $$r/../gcc/xg++ -B$$r/../gcc/; \
+ fi; \
else \
if [ "@host@" = "@target@" ] ; then \
echo $(CXX); \
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 66e9e7e..cc13a1e 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -455,6 +455,12 @@ CXX_FOR_TARGET = ` \
else \
echo $$r/../gcc/g++ -B$$r/../gcc/; \
fi; \
+ elif [ -f $$r/../gcc/xg++ ] ; then \
+ if [ -f $$r/../newlib/Makefile ] ; then \
+ echo $$r/../gcc/xg++ -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
+ else \
+ echo $$r/../gcc/xg++ -B$$r/../gcc/; \
+ fi; \
else \
if [ "@host@" = "@target@" ] ; then \
echo $(CXX); \