diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | common.mk | 3 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | ext/extmk.rb | 16 |
5 files changed, 28 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Fri May 23 09:52:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb. + [ruby-core:16642] + + * ext/extmk.rb: load purelib.rb only when not cross compiling. + Fri May 23 04:22:19 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak. diff --git a/Makefile.in b/Makefile.in index 18537a53ad..a37bcf65fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,6 +35,9 @@ RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system empty = OUTFLAG = @OUTFLAG@$(empty) CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@ +cflags = @cflags@ +optflags = @optflags@ +debugflags = @debugflags@ CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ EXTLDFLAGS = @@ -113,6 +113,9 @@ install-local: pre-install-local do-install-local post-install-local pre-install-local:: pre-install-bin pre-install-lib pre-install-man do-install-local: $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)" +loadpath: $(PREP) + $(MINIRUBY) -e 'p $$:' + post-install-local:: post-install-bin post-install-lib post-install-man install-ext: pre-install-ext do-install-ext post-install-ext diff --git a/configure.in b/configure.in index 0dd53a9e90..486f2ce539 100644 --- a/configure.in +++ b/configure.in @@ -1635,6 +1635,11 @@ case "$build_os" in esac CPPFLAGS="$CPPFLAGS "'$(DEFS)' +test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}' +test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}' +AC_SUBST(cppflags, [])dnl +AC_SUBST(optflags)dnl +AC_SUBST(debugflags)dnl AC_SUBST(XCFLAGS)dnl AC_SUBST(XLDFLAGS)dnl AC_SUBST(LIBRUBY_LDSHARED) diff --git a/ext/extmk.rb b/ext/extmk.rb index 06dd2f7c2c..64746552c1 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -298,7 +298,7 @@ def parse_args() $mflags.unshift(*rest) unless rest.empty? def $mflags.set?(flag) - grep(/\A-(?!-).*#{'%c' % flag}/i) { return true } + grep(/\A-(?!-).*#{flag.chr}/i) { return true } false end def $mflags.defined?(var) @@ -354,12 +354,16 @@ elsif sep = config_string('BUILD_FILE_SEPARATOR') else $ruby = '$(topdir)/miniruby' + EXEEXT end -$ruby << " -I'$(topdir)' -I'$(top_srcdir)/lib'" -$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout -$ruby << " -I'$(top_srcdir)/ext' -rpurelib.rb" +$ruby << " -I'$(topdir)'" +unless CROSS_COMPILING + $ruby << " -I'$(top_srcdir)/lib'" + $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout + $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb" + ENV["RUBYLIB"] = "-" + ENV["RUBYOPT"] = "-rpurelib.rb" +end $config_h = '$(topdir)/config.h' -ENV["RUBYLIB"] = "-" -ENV["RUBYOPT"] = "-rpurelib.rb" +$mflags << "ruby=#$ruby" MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)} |