Your gcc-lib -> gcc patch seems to break --enable-version-specific-runtime-libs on cygwin

["Giovanni Bajo" <giovannibajo at libero dot it>]

Hello Geoff,

this patch:

http://gcc.gnu.org/ml/gcc-patches/2003-07/msg03026.html
2003-07-31  Geoffrey Keating  <geoffk@apple.com>
    ...
    (libsubdir): Use gcc instead of gcc-lib.

seems to break --enable-version-specific-runtime-libs on cygwin. Bootstrap
succeeds, but the v3 makefile tells me that libraries are installed within
/usr/lib/gcc-lib/. Then, when I compile something, the compiler will look for
the libraries into /usr/lib/gcc. My configure line is:

Configured with:
../gcc/configure --enable-languages=c,c++ --enable-threads=posix --with-system-z
lib --enable-nls --without-included-gettext --enable-version-specific-runtime-li
bs --disable-shared --prefix=/usr --program-suffix=-3.4 --disable-pch :
(reconfigured)

I had tested the attacched patch to fix it (provided by Danny Smith), with no
success. After having applied the patch, bootstrap fails this way:

make[2]: Leaving directory `/cygdrive/d/code/gcc/mainline/out/i686-pc-cygwin/lib
stdc++-v3/include'
/bin/sh ../gcc/mkinstalldirs i686-pc-cygwin/libiberty ; \
rm -f i686-pc-cygwin/libiberty/Makefile || : ; \
cp multilib.out i686-pc-cygwin/libiberty/multilib.out
mkdir -p -- i686-pc-cygwin/libiberty
Configuring in i686-pc-cygwin/libiberty
configure: error: invalid package name: target-subdir
make[1]: *** [configure-target-libiberty] Error 1
make[1]: Leaving directory `/cygdrive/d/code/gcc/mainline/out'
make: *** [bootstrap] Error 2

Can you please look into this? Thanks

Giovanni Bajo



Index: aclocal.m4
===================================================================
RCS file: /cvsroot/gcc/gcc/libstdc++-v3/aclocal.m4,v
retrieving revision 1.287
diff -c -r1.287 aclocal.m4
*** aclocal.m4  16 Oct 2003 22:37:40 -0000      1.287
--- aclocal.m4  28 Oct 2003 17:51:32 -0000
***************
*** 731,739 ****
      # and header files if --enable-version-specific-runtime-libs option
      # is selected.
      if test x"$gxx_include_dir" = x"no"; then
!
gxx_include_dir='${libdir}/gcc-lib/${host_alias}/'$gcc_version/include/c++
      fi
!     glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
      glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
    fi

--- 731,739 ----
      # and header files if --enable-version-specific-runtime-libs option
      # is selected.
      if test x"$gxx_include_dir" = x"no"; then
!       gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
      fi
!     glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
      glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
    fi

***************
*** 745,751 ****
        glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
        glibcxx_toolexeclibdir='${toolexecdir}/lib'
      else
!       glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
        glibcxx_toolexeclibdir='${libdir}'
      fi
      multi_os_directory=`$CXX -print-multi-os-directory`
--- 745,751 ----
        glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
        glibcxx_toolexeclibdir='${toolexecdir}/lib'
      else
!       glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
        glibcxx_toolexeclibdir='${libdir}'
      fi
      multi_os_directory=`$CXX -print-multi-os-directory`