summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-13 15:28:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-13 15:28:16 +0000
commit56c61b5cdef1aaecedd5d3b8512ca4f82171eaab (patch)
tree49b79d8979a45b4c6ea0bcb03af069d63c0f36c5
parentf10646970b5104dbf4484ecb728e3c91feb1414e (diff)
LIBPATHENV on Windows
* configure.in, win32/Makefile.sub: set LIBPATHENV to PATH on Windows, for extra DLLs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--configure.in2
-rw-r--r--win32/Makefile.sub2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 8bad2b7..69a2a05 100644
--- a/configure.in
+++ b/configure.in
@@ -3446,7 +3446,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
: ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
- : ${LIBPATHENV=""}
+ : ${LIBPATHENV=PATH}
: ${PRELOADENV=""}
rb_cv_dlopen=yes],
[hiuxmpp], [ : ${LDSHARED='$(LD) -r'}],
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 3a9e544..cf035ea 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -917,6 +917,8 @@ s,@OUTFLAG@,$(OUTFLAG),;t t
s,@COUTFLAG@,$(COUTFLAG),;t t
s,@CSRCFLAG@,$(CSRCFLAG),;t t
s,@CPPOUTFILE@,-P,;t t
+s,@PRELOADENV@,,;t t
+s,@LIBPATHENV@,PATH,;t t
s,@LIBPATHFLAG@, -libpath:%s,;t t
s,@RPATHFLAG@,,;t t
s,@LIBARG@,%s.lib,;t t