OSDN Git Service

PR target/40125
authordavek <davek@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 26 Jan 2011 03:33:09 +0000 (03:33 +0000)
committerdavek <davek@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 26 Jan 2011 03:33:09 +0000 (03:33 +0000)
* configure.ac (AM_LTLDFLAGS): Add -bindir option for windows DLLs.
* configure: Regenerate.

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

libffi/ChangeLog
libffi/configure
libffi/configure.ac

index a8438a3..f5db1e4 100644 (file)
@@ -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
index 0db3728..a4a4a19 100755 (executable)
@@ -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
index f9bde00..a7e97d5 100644 (file)
@@ -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