diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 1 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Fri Nov 13 23:00:23 2015 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * configure.in: unset LD_PRELOAD on mingw. msys2 child processes + crash at make test-all with LD_PRELOAD. + [ruby-core:71461] [Bug #11680] + Fri Nov 13 14:00:43 2015 Zachary Scott <zzak@ruby-lang.org> * ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735] diff --git a/configure.in b/configure.in index 0d253a9547..e97871d110 100644 --- a/configure.in +++ b/configure.in @@ -3126,6 +3126,7 @@ if test "$with_dln_a_out" != yes; then XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import" : ${LIBPATHENV=""} + : ${PRELOADENV=""} rb_cv_dlopen=yes], [hiuxmpp], [ : ${LDSHARED='$(LD) -r'}], [atheos*], [ : ${LDSHARED='$(CC) -shared'} |