From 06ea285dcbfb67189e46bee7f4f7c9b4140fc681 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 18 Feb 2016 10:10:36 +0000 Subject: 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. --- ld/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ld/Makefile.am') 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); \ -- cgit v1.2.1