diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-04 06:34:10 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-04 06:34:10 +0000 |
| commit | d6c6653490e101ded061a0bfca2e49bac91cb907 (patch) | |
| tree | 314693683aa1d37b9576e3c60561cb3ee191f45d /lib | |
| parent | 1a70fe690870fc90bdd7702f9637cd953ad6a522 (diff) | |
merge revision(s) 23240:
* lib/mkmf.rb (init_mkmf): needs default library path even if
cross compiling.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 416292d0d1..c9e738a128 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1710,7 +1710,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 = [] |