re PR target/40125 (libgcc_s DLL installed in wrong directory in cross toolchain)

	PR target/40125
	* configure.ac (AM_LTLDFLAGS): Add -bindir option for windows DLLs.
	* configure: Regenerate.

From-SVN: r169272

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index a8438a33e9c29d630540a93245c32af216a18134..f5db1e4792f924a5ecb5e09c368513bd220389b5 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-26  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       PR target/40125
+       * configure.ac (AM_LTLDFLAGS): Add -bindir option for windows DLLs.
+       * configure: Regenerate.
+
 2010-12-18  Iain Sandoe  <iains@gcc.gnu.org>
 
        PR libffi/29152

diff --git a/libffi/configure b/libffi/configure
index 0db3728360a87f46124e6bc1da0658ff61708ae0..a4a4a1932cacb35f706de7718f2b35cbb1980b27 100755 (executable)
--- a/libffi/configure
+++ b/libffi/configure
@@ -11359,8 +11359,15 @@ case "$host" in
        ;;
   i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-os2*)
        TARGET=X86_WIN32; TARGETDIR=x86
-       # All mingw/cygwin/win32 builds require this for sharedlib
-       AM_LTLDFLAGS="-no-undefined"
+       # All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
+       # We must also check with_cross_host to decide if this is a native
+       # or cross-build and select where to install dlls appropriately.
+       if test -n "$with_cross_host" &&
+          test x"$with_cross_host" != x"no"; then
+         AM_LTLDFLAGS='-no-undefined -bindir "$(toolexeclibdir)"';
+       else
+         AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
+       fi
        ;;
   i?86-*-darwin*)
        TARGET=X86_DARWIN; TARGETDIR=x86

diff --git a/libffi/configure.ac b/libffi/configure.ac
index f9bde00bd30cf9e6c86123cb077e9ca22cc1f3a9..a7e97d5ec7130e0b87baa88ae109806588235d13 100644 (file)
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -82,8 +82,15 @@ case "$host" in
        ;;
   i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-os2*)
        TARGET=X86_WIN32; TARGETDIR=x86
-       # All mingw/cygwin/win32 builds require this for sharedlib
-       AM_LTLDFLAGS="-no-undefined"
+       # All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
+       # We must also check with_cross_host to decide if this is a native
+       # or cross-build and select where to install dlls appropriately.
+       if test -n "$with_cross_host" &&
+          test x"$with_cross_host" != x"no"; then
+         AM_LTLDFLAGS='-no-undefined -bindir "$(toolexeclibdir)"';
+       else
+         AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
+       fi
        ;;
   i?86-*-darwin*)
        TARGET=X86_DARWIN; TARGETDIR=x86