diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 11 | ||||
| -rw-r--r-- | test/dbm/test_dbm.rb | 4 | ||||
| -rw-r--r-- | test/gdbm/test_gdbm.rb | 4 |
4 files changed, 15 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Wed Feb 28 01:22:58 2007 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use + target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225] + Wed Feb 28 00:08:11 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp> * mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL'] diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 5d8bf244b3..c4e4c04dae 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -265,7 +265,7 @@ ensure log_src(src) end -def link_command(ldflags, opt="", libpath=$LIBPATH) +def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$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=$LIBPATH) +def libpathflag(libpath=$DEFLIBPATH|$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 = $LIBPATH + libpath = $DEFLIBPATH|$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 = #{$LIBPATH.join(" ")} +libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")} LIBPATH = #{libpath} DEFFILE = #{deffile} @@ -1424,7 +1424,8 @@ def init_mkmf(config = CONFIG) $LIBRUBYARG = "" $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] - $LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"] + $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"] + $LIBPATH = [] $INSTALLFILES = nil $objs = nil diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb index d4d488f577..941e139946 100644 --- a/test/dbm/test_dbm.rb +++ b/test/dbm/test_dbm.rb @@ -12,7 +12,7 @@ if defined? DBM class TestDBM < Test::Unit::TestCase def TestDBM.uname_s require 'rbconfig' - case Config::CONFIG['host_os'] + case Config::CONFIG['target_os'] when 'cygwin' require 'Win32API' uname = Win32API.new('cygwin1', 'uname', 'P', 'I') @@ -21,7 +21,7 @@ if defined? DBM utsname.unpack('A20' * 5)[0] else - Config::CONFIG['host_os'] + Config::CONFIG['target_os'] end end SYSTEM = uname_s diff --git a/test/gdbm/test_gdbm.rb b/test/gdbm/test_gdbm.rb index 034f62085d..b84221e547 100644 --- a/test/gdbm/test_gdbm.rb +++ b/test/gdbm/test_gdbm.rb @@ -12,7 +12,7 @@ if defined? GDBM class TestGDBM < Test::Unit::TestCase def TestGDBM.uname_s require 'rbconfig' - case Config::CONFIG['host_os'] + case Config::CONFIG['target_os'] when 'cygwin' require 'Win32API' uname = Win32API.new('cygwin1', 'uname', 'P', 'I') @@ -21,7 +21,7 @@ if defined? GDBM utsname.unpack('A20' * 5)[0] else - Config::CONFIG['host_os'] + Config::CONFIG['target_os'] end end SYSTEM = uname_s |