Cygwin patch for Makefile.in

[Nick Clifton <nickc at cygnus dot com>]

Hi Guys,

  I would like to submit a little patch developed by Chris Faylor to
  fix the library search paths for cygwin builds.

  [Incidentally wouldn't it be easier to use multiple "echo -n"
  statements to generate these strings ?]

  As an added bonus this patch also includes a fix for a spelling
  mistake of "check-snavigator" in CROSS_CHECK_MODULES

  OK to apply ?

Cheers
	Nick


2000-01-27  Christopher Faylor <cgf@redhat.com>

	* Makefile.in (CC_FOR_TARGET): Add new winsup directory
	structure stuff to -L library search.
	(CXX_FOR_TARGET): Ditto.
	(CROSS_CHECK_MODULES): Fix spelling mistake.


Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/Makefile.in,v
retrieving revision 1.43
diff -p -r1.43 Makefile.in
*** Makefile.in	2000/01/24 21:02:27	1.43
- --- Makefile.in	2000/01/28 00:27:54
*************** INSTALL_TARGET_CROSS = installdirs \
*** 213,223 ****
  CC_FOR_TARGET = ` \
    if [ -f $$r/gcc/xgcc ] ; then \
      if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
!       if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
!         echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
!       else \
!         echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
!       fi; \
      else \
        echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \
      fi; \
- --- 213,230 ----
  CC_FOR_TARGET = ` \
    if [ -f $$r/gcc/xgcc ] ; then \
      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 -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/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; \
!           ;; \
!         *) \
!           if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
!             echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
!           else \
!             echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
!           fi; \
! 	  ;; \
!       esac \
      else \
        echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \
      fi; \
*************** CHILL_FOR_TARGET = ` \
*** 249,259 ****
  CXX_FOR_TARGET = ` \
    if [ -f $$r/gcc/g++ ] ; then \
      if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
!       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; \
!       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; \
!       fi; \
      else \
        echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/; \
      fi; \
- --- 256,273 ----
  CXX_FOR_TARGET = ` \
    if [ -f $$r/gcc/g++ ] ; then \
      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; \
!           ;; \
!         *) \
!           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; \
!           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; \
!           fi; \
! 	  ;; \
!       esac \
      else \
        echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/; \
      fi; \
*************** CROSS_CHECK_MODULES = \
*** 629,635 ****
  	check-sed \
  	check-send-pr \
  	check-shellutils \
! 	check-snaviagor \
  	check-sim \
  	check-tar \
  	check-tcl \
- --- 643,649 ----
  	check-sed \
  	check-send-pr \
  	check-shellutils \
! 	check-snavigator \
  	check-sim \
  	check-tar \
  	check-tcl \