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

* lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)

Browse source 
should be the first elements of library paths list.
  reported by KOBAYASHI Yasuhiro [ruby-list:43225]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-02-28 09:26:07 +00:00
parent f9b349adb5
commit bcb0b021e3
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Feb 28 18:23:43 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)
should be the first elements of library paths list.
reported by KOBAYASHI Yasuhiro [ruby-list:43225]
Wed Feb 28 10:33:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Feb 28 10:33:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, configure.in, */Makefile.sub (THREAD_MODEL): system * Makefile.in, configure.in, */Makefile.sub (THREAD_MODEL): system

11
lib/mkmf.rb
View file

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