diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-23 13:08:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-23 13:08:29 +0000 |
| commit | 763f629e77424ab8a4886d2e9c3c531765796bb6 (patch) | |
| tree | 1507bac84c444c441be8d373263a839c55f25679 /lib/mkmf.rb | |
| parent | 364c4a0974138e77b63216c9154ed844144ac776 (diff) | |
* lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current
directory.
* lib/mkmf.rb (init_mkmf): add current directory to default
library path with highest priority. [ruby-core:10960]
* lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c4e4c04dae..2189a436ee 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -291,7 +291,12 @@ end def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) libpath.map{|x| - (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x.quote + case x + when "$(topdir)", /\A\./ + LIBPATHFLAG + else + LIBPATHFLAG+RPATHFLAG + end % x.quote }.join end @@ -1425,6 +1430,7 @@ def init_mkmf(config = CONFIG) $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"] + $DEFLIBPATH.unshift(".") $LIBPATH = [] $INSTALLFILES = nil @@ -1516,8 +1522,8 @@ LINK_SO = config_string('LINK_SO') || if CONFIG["DLEXT"] == $OBJEXT "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n" else - "$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$@ " \ - "$(OBJS) $(LOCAL_LIBS) $(LIBS)" + "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \ + "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)" end LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"' RPATHFLAG = config_string('RPATHFLAG') || '' |