diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-28 09:35:21 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-28 09:35:21 +0000 |
| commit | 9ca62dbd7ff63653c25f9fdd87307246c294bcec (patch) | |
| tree | 9cc5316c94abef9056dc51e70c824c4ca363235f /lib | |
| parent | 3c39300bcac10da7ba339fc604f59453c21ddde2 (diff) | |
* lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)
should be the first elements of library paths list.
reported by KOBAYASHI Yasuhiro [ruby-list:43225]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 11 |
1 files changed, 6 insertions, 5 deletions
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 |