diff options
| author | Nick Clifton <nickc@redhat.com> | 2016-02-18 10:10:36 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2016-02-18 10:10:36 +0000 |
| commit | 06ea285dcbfb67189e46bee7f4f7c9b4140fc681 (patch) | |
| tree | 5a9c1df22af6f65bfdd0a5520243ad83a8d983fd | |
| parent | 9136aa49abcb3f23171e01ebd16ee03cc1032943 (diff) | |
| download | binutils-gdb-06ea285dcbfb67189e46bee7f4f7c9b4140fc681.tar.gz | |
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.
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/Makefile.am | 6 | ||||
| -rw-r--r-- | ld/Makefile.in | 6 |
3 files changed, 19 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index dbaf837a7b1..badac3733ee 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 8bfd318ec78..818af5aa5c3 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 66e9e7ef18d..cc13a1e15c7 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); \ |