summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-13 14:11:30 +0000
committershirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-13 14:11:30 +0000
commitf2b760e3360bcbbf942dd87daac21643c2aa81c7 (patch)
tree38335df396bc220e8307507b65c896774a1cb812
parent293aa87118c2d4e850dc8fc472160e3549cfa55d (diff)
Unset LD_PRELOAD on mingw
* configure.in: unset LD_PRELOAD on mingw. msys2 child processes crash at make test-all with LD_PRELOAD. [ruby-core:71461] [Bug #11680] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--configure.in1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b01f4eb..ee8ce90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 0d253a9..e97871d 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'}