summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-02 16:06:08 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-02 16:06:08 +0000
commit2e522aec8fe1a8bbfc676b6c36bf6a7f1b55f9a9 (patch)
tree6968654d909022ba326ec6ab6db2668aeaa42b5e
parent89333366a0814712471f16ad2e0942857bb065ec (diff)
* configure.in: set PRELOADENV in Solaris to avoid "wrong ELF class" error.
[Bug #10926] [ruby-dev:48888] * configure.in: set LIBPATHENV for 32-bit compile in Solaris in addition to 64-bit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--configure.in4
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ad2c1d68cf..d7bfb18f6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar 3 00:59:39 2015 Naohisa Goto <ngotogenome@gmail.com>
+
+ * configure.in: set PRELOADENV in Solaris to avoid "wrong ELF class"
+ error. [Bug #10926] [ruby-dev:48888]
+ * configure.in: set LIBPATHENV for 32-bit compile in Solaris
+ in addition to 64-bit.
+
Mon Mar 2 15:36:10 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: do not check _setjmp unless _longjmp is available,
diff --git a/configure.in b/configure.in
index a538c41759..2896bc2ef9 100644
--- a/configure.in
+++ b/configure.in
@@ -2963,6 +2963,10 @@ if test "$with_dln_a_out" != yes; then
fi
if test "$ac_cv_sizeof_voidp" = 8; then
: ${LIBPATHENV=LD_LIBRARY_PATH_64}
+ : ${PRELOADENV=LD_PRELOAD_64}
+ else
+ : ${LIBPATHENV=LD_LIBRARY_PATH_32}
+ : ${PRELOADENV=LD_PRELOAD_32}
fi
rb_cv_dlopen=yes],
[sunos*], [ : ${LDSHARED='$(LD) -assert nodefinitions'}