diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-19 23:41:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-19 23:41:36 +0000 |
| commit | 69ce2b703713c408dd92d396bcc2dd56d6b343b0 (patch) | |
| tree | 08dbf835b4c431faf1a5c3f884de0b019bc44003 /lib/mkmf.rb | |
| parent | 6209b66b8c16bda636f0feef4ef002cad86d9046 (diff) | |
mkmf.rb: prefer $LIBPATH than $DEFLIBPATH
* lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer
user specified `$LIBPATH` than `$DEFLIBPATH`. [ruby-core:62100]
[ruby-trunk - Bug #9760]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45640 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 1da0e59915..a8553fc07d 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -467,7 +467,7 @@ MSG end end - def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) + def link_command(ldflags, opt="", libpath=$LIBPATH|$DEFLIBPATH) 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=$DEFLIBPATH|$LIBPATH) + def libpathflag(libpath=$LIBPATH|$DEFLIBPATH) libpath.map{|x| case x when "$(topdir)", /\A\./ @@ -2125,7 +2125,7 @@ RULES # def create_makefile(target, srcprefix = nil) $target = target - libpath = $DEFLIBPATH|$LIBPATH + libpath = $LIBPATH|$DEFLIBPATH message "creating Makefile\n" MakeMakefile.rm_f "#{CONFTEST}*" if CONFIG["DLEXT"] == $OBJEXT @@ -2206,7 +2206,7 @@ RULES conf = yield(conf) if block_given? mfile.puts(conf) mfile.print " -libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")} +libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")} LIBPATH = #{libpath} DEFFILE = #{deffile} |