summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-15 12:20:34 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-15 12:20:34 +0000
commita76f39f9fe8efd5e08d6fb40235fc7f54398a8fe (patch)
tree3498eaab7e2c8cd71fa7a91fb560723409f8711a /lib
parentb44f67162477d5a75473653160d8c6fbbb382a94 (diff)
downloadruby-a76f39f9fe8efd5e08d6fb40235fc7f54398a8fe.tar.gz
ruby-a76f39f9fe8efd5e08d6fb40235fc7f54398a8fe.tar.xz
ruby-a76f39f9fe8efd5e08d6fb40235fc7f54398a8fe.zip
* lib/mkmf.rb (init_mkmf): add $(topdir) to $LIBPATH if $extmk.
remove adding $(archdir) to $LIBPATH. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index bf661346b..0dcd32bc5 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -780,16 +780,14 @@ def init_mkmf(config = CONFIG)
$LIBRUBYARG = ""
$LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
$LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
- $LIBPATH = []
+ $LIBPATH = $extmk ? ["$(topdir)"] : []
$objs = nil
$libs = ""
if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup)
- $LIBPATH = ["$(topdir)"]
$LIBPATH.unshift("$(libdir)") unless $extmk or defined? CROSS_COMPILING
$LIBRUBYARG = config['LIBRUBYARG']
end
- $LIBPATH << "$(archdir)"
$LOCAL_LIBS = ""
dir_config("opt")