* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32184 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/ChangeLog b/ChangeLog
index 0c67108..2faf26f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2000-02-24  Nick Clifton  <nickc@cygnus.com>
 
        * config.sub: Support an OS of "wince".

diff --git a/Makefile.in b/Makefile.in
index c6ea61f..0de1a86 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -213,11 +213,18 @@ INSTALL_TARGET_CROSS = installdirs \
 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; \
+      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; \
@@ -249,11 +256,18 @@ CHILL_FOR_TARGET = ` \
 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; \
+      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; \
@@ -629,7 +643,7 @@ CROSS_CHECK_MODULES = \
        check-sed \
        check-send-pr \
        check-shellutils \
-       check-snaviagor \
+       check-snavigator \
        check-sim \
        check-tar \
        check-tcl \