diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | lib/mkmf.rb | 12 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,13 @@ +Wed May 23 03:50:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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. + Wed May 23 03:33:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond): 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') || '' @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-05-23" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070523 -#define RUBY_PATCHLEVEL 17 +#define RUBY_PATCHLEVEL 18 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |