diff options
| author | Christopher Faylor <cgf@redhat.com> | 2000-02-26 20:04:50 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2000-02-26 13:04:50 -0700 |
| commit | 1ebe758fd2e27898f25c4a0c7b1c1aaacd76be47 (patch) | |
| tree | 67e90b47bcbcb4f6050565c41b84f3cda6f9ccea /Makefile.in | |
| parent | 42235f853e242b9eff7a5fdeedbc742e8cffdfbc (diff) | |
| download | gcc-1ebe758fd2e27898f25c4a0c7b1c1aaacd76be47.tar.gz | |
Makefile.in (CC_FOR_TARGET): Add new winsup directory structure stuff to -L library search.
* 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.
From-SVN: r32184
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index c6ea61f3481..0de1a86dea8 100644 --- 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 \ |