diff options
| author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-24 12:10:48 +0000 |
|---|---|---|
| committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-24 12:10:48 +0000 |
| commit | d9bf31ccefb7dd81653c36e15c6950ca238c1d65 (patch) | |
| tree | 7e08008feb454b3b06837d8695645bda3db709f2 /lib/mkmf.rb | |
| parent | 136b5b752dc1b6143bcfb8985ef63a884fb510e4 (diff) | |
| download | ruby-d9bf31ccefb7dd81653c36e15c6950ca238c1d65.tar.gz | |
* lib/mkmf.rb: Revert r45640 because it may lead to link
with different libruby. [Bug #9760]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1a9b8fb670..d871a9bf82 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -467,7 +467,7 @@ MSG end end - def link_command(ldflags, opt="", libpath=$LIBPATH|$DEFLIBPATH) + def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)" conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'src' => "#{CONFTEST_C}", @@ -503,7 +503,7 @@ MSG conf) end - def libpathflag(libpath=$LIBPATH|$DEFLIBPATH) + def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) libpath.map{|x| case x when "$(topdir)", /\A\./ @@ -2179,7 +2179,7 @@ RULES # def create_makefile(target, srcprefix = nil) $target = target - libpath = $LIBPATH|$DEFLIBPATH + libpath = $DEFLIBPATH|$LIBPATH message "creating Makefile\n" MakeMakefile.rm_f "#{CONFTEST}*" if CONFIG["DLEXT"] == $OBJEXT @@ -2260,7 +2260,7 @@ RULES conf = yield(conf) if block_given? mfile.puts(conf) mfile.print " -libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")} +libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")} LIBPATH = #{libpath} DEFFILE = #{deffile} |