diff options
| -rw-r--r-- | libffi/ChangeLog | 6 | ||||
| -rwxr-xr-x | libffi/configure | 11 | ||||
| -rw-r--r-- | libffi/configure.ac | 11 |
3 files changed, 24 insertions, 4 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index a8438a33e9c..f5db1e4792f 100644 --- 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 0db3728360a..a4a4a1932ca 100755 --- 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 f9bde00bd30..a7e97d5ec71 100644 --- 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 |
