diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-13 06:54:01 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-13 06:54:01 +0000 |
| commit | bd580a0428a73016e45dff77503cd84a6b32c08b (patch) | |
| tree | 48df03692f6322a888e236403834612a13c4de69 /lib | |
| parent | 044d7cc06b1d9f015bd725d64113482dfd278b4b (diff) | |
| download | ruby-bd580a0428a73016e45dff77503cd84a6b32c08b.tar.gz ruby-bd580a0428a73016e45dff77503cd84a6b32c08b.tar.xz ruby-bd580a0428a73016e45dff77503cd84a6b32c08b.zip | |
* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
extmk mode.
* lib/mkmf.rb (dir_config): Prepend a new library path instead of
appending so it is tried first.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c8640f55c..ec5cbf4bb 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -670,7 +670,7 @@ def dir_config(target, idefault=nil, ldefault=nil) ldirs.concat(defaults.collect {|dir| dir + "/lib"}) ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR) end - $LIBPATH |= ldirs + $LIBPATH = ldirs | $LIBPATH [idir, ldir] end @@ -969,8 +969,7 @@ def init_mkmf(config = CONFIG) $LIBRUBYARG = "" $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] - $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"] - $LIBPATH.unshift("$(topdir)") if $extmk + $LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"] $INSTALLFILES = nil $objs = nil |