Project

General

Profile

Bug #9760 ยป fix_default_libpath.diff

zanegray (Andrew DeMaria), 04/19/2014 10:12 PM

View differences:

lib/mkmf.rb
467 467
    end
468 468
  end
469 469

  
470
  def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
470
  def link_command(ldflags, opt="", libpath=$LIBPATH|$DEFLIBPATH)
471 471
    librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)"
472 472
    conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
473 473
                                  'src' => "#{CONFTEST_C}",
......
503 503
                     conf)
504 504
  end
505 505

  
506
  def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
506
  def libpathflag(libpath=$LIBPATH|$DEFLIBPATH)
507 507
    libpath.map{|x|
508 508
      case x
509 509
      when "$(topdir)", /\A\./
......
2125 2125
  #
2126 2126
  def create_makefile(target, srcprefix = nil)
2127 2127
    $target = target
2128
    libpath = $DEFLIBPATH|$LIBPATH
2128
    libpath = $LIBPATH|$DEFLIBPATH
2129 2129
    message "creating Makefile\n"
2130 2130
    MakeMakefile.rm_f "#{CONFTEST}*"
2131 2131
    if CONFIG["DLEXT"] == $OBJEXT
......
2206 2206
    conf = yield(conf) if block_given?
2207 2207
    mfile.puts(conf)
2208 2208
    mfile.print "
2209
libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
2209
libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")}
2210 2210
LIBPATH = #{libpath}
2211 2211
DEFFILE = #{deffile}
2212 2212