diff options
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 6 | ||||
| -rwxr-xr-x | libffi/configure | 9 | ||||
| -rw-r--r-- | libffi/configure.ac | 9 |
3 files changed, 24 insertions, 0 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 47d31fa73c1..3521bdc0044 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,9 @@ +2012-02-10 Kai Tietz <ktietz@redhat.com> + + * configure.ac (AM_LTLDFLAGS): Add -no-undefine for x64 + windows target. + * configure: Regenerated. + 2012-02-08 Kai Tietz <ktietz@redhat.com> * src/prep_cif.c (ffi_prep_cif): Allow for X86_WIN32 diff --git a/libffi/configure b/libffi/configure index 7a7d24559c3..15914953909 100755 --- a/libffi/configure +++ b/libffi/configure @@ -11435,6 +11435,15 @@ case "$host" in x86_64-*-cygwin* | x86_64-*-mingw*) TARGET=X86_WIN64; TARGETDIR=x86 + # 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 ;; x86_64-*-*) diff --git a/libffi/configure.ac b/libffi/configure.ac index 0788b3165dd..5036e25a288 100644 --- a/libffi/configure.ac +++ b/libffi/configure.ac @@ -166,6 +166,15 @@ case "$host" in x86_64-*-cygwin* | x86_64-*-mingw*) TARGET=X86_WIN64; TARGETDIR=x86 + # 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 ;; x86_64-*-*) |