diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-21 00:20:25 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-21 00:20:25 +0000 |
| commit | 00167300b82f02063d29655698f6d5ac2111b0b4 (patch) | |
| tree | 350a5f81f38ce8534b0311635fed7f9d14616cc9 | |
| parent | a30fe360801875148fc68a338583eacbe54737ab (diff) | |
| download | ruby-00167300b82f02063d29655698f6d5ac2111b0b4.tar.gz ruby-00167300b82f02063d29655698f6d5ac2111b0b4.tar.xz ruby-00167300b82f02063d29655698f6d5ac2111b0b4.zip | |
* lib/mkmf.rb (init_mkmf): needs default library path even if
cross compiling.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Apr 21 09:20:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (init_mkmf): needs default library path even if + cross compiling. + Tue Apr 21 07:07:45 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * array.c (rb_ary_push): bypass rb_ary_store(). diff --git a/lib/mkmf.rb b/lib/mkmf.rb index bc8470871..4c69eb6d6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1873,7 +1873,7 @@ def init_mkmf(config = CONFIG) $LIBRUBYARG = "" $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] - $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"] + $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"] $DEFLIBPATH.unshift(".") $LIBPATH = [] $INSTALLFILES = [] |