kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* sorry, commit misstake. reverted.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-02-27 16:29:24 +00:00
parent 00a0b78f17
commit 9781dd1bc2
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/mkmf.rb
View file

@ -265,7 +265,7 @@ ensure
log_src(src)
end
def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
def link_command(ldflags, opt="", libpath=$LIBPATH)
Config::expand(TRY_LINK.dup,
CONFIG.merge('hdrdir' => $hdrdir.quote,
'src' => CONFTEST_C,
@ -289,7 +289,7 @@ def cpp_command(outfile, opt="")
CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote))
end
def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
def libpathflag(libpath=$LIBPATH)
libpath.map{|x|
(x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x.quote
}.join
@ -1142,7 +1142,7 @@ end
#
def create_makefile(target, srcprefix = nil)
$target = target
libpath = $DEFLIBPATH|$LIBPATH
libpath = $LIBPATH
message "creating Makefile\n"
rm_f "conftest*"
if CONFIG["DLEXT"] == $OBJEXT
@ -1204,7 +1204,7 @@ def create_makefile(target, srcprefix = nil)
mfile = open("Makefile", "wb")
mfile.print configuration(srcprefix)
mfile.print "
libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
libpath = #{$LIBPATH.join(" ")}
LIBPATH = #{libpath}
DEFFILE = #{deffile}
@ -1424,8 +1424,7 @@ def init_mkmf(config = CONFIG)
$LIBRUBYARG = ""
$LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
$LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
$DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
$LIBPATH = []
$LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
$INSTALLFILES = nil
$objs = nil