From 34be2b3691b3cd19938a40e80b307491d8a7ad37 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Thu, 6 Jul 2000 00:50:01 +0000 Subject: [PATCH] Fix CXX_FOR_TARGET to add -L libstdc++ From-SVN: r34878 --- ChangeLog | 7 +++++++ Makefile.in | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 206ecffaa144..65d19ad4c45f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-07-05 Jim Wilson + + * Makefile.in (CXX_FOR_TARGET): Add libstdc++ to the library + search path for a g++ extracted from the build tree. This + will allow link tests run by configure scripts in + subdirectories to succeed. + 2000-06-29 Michael Hayes * MAINTAINERS: Add myself as loop discovery maintainer. diff --git a/Makefile.in b/Makefile.in index 578a663a148f..c74422e1b4bf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -258,18 +258,18 @@ CXX_FOR_TARGET = ` \ if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ case "$(target_canonical)" in \ i[3456]86-*-cygwin*) \ - echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/cygwin/include -idirafter $$s/winsup/w32api/include -idirafter $$s/newlib/libc/include -idirafter $$s/newlib/libc/sys/cygwin -idirafter $$s/newlib/libc/sys/cygwin32 -nostdinc; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/cygwin/include -idirafter $$s/winsup/w32api/include -idirafter $$s/newlib/libc/include -idirafter $$s/newlib/libc/sys/cygwin -idirafter $$s/newlib/libc/sys/cygwin32 -nostdinc -L$$r/$(TARGET_SUBDIR)/libstdc++; \ ;; \ *) \ if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \ - echo $$r/gcc/g++ -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + echo $$r/gcc/g++ -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc -L$$r/$(TARGET_SUBDIR)/libstdc++; \ else \ - echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc -L$$r/$(TARGET_SUBDIR)/libstdc++; \ fi; \ ;; \ esac \ else \ - echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/; \ + echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/ -L$$r/$(TARGET_SUBDIR)/libstdc++; \ fi; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \