Project

General

Profile

Bug #9760 » fix_default_libpath.diff

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

View differences:

lib/mkmf.rb
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}",
......
conf)
end
def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
def libpathflag(libpath=$LIBPATH|$DEFLIBPATH)
libpath.map{|x|
case x
when "$(topdir)", /\A\./
......
#
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
......
conf = yield(conf) if block_given?
mfile.puts(conf)
mfile.print "
libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")}
LIBPATH = #{libpath}
DEFFILE = #{deffile}
(1-1/2)