Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

* dmyversion.c: empty load path in miniruby.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 26051e1d06f128fa2201d01936761634e8925c8e 1 parent ecc7757
Nobuyoshi Nakada nobu authored

Showing 4 changed files with 10 additions and 3 deletions. Show diff stats Hide diff stats

  1. +3 1 ChangeLog
  2. +3 2 common.mk
  3. +2 0  dmyversion.c
  4. +2 0  version.c
4 ChangeLog
... ... @@ -1,4 +1,6 @@
1   -Mon Feb 8 16:23:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
  1 +Mon Feb 8 16:27:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
  2 +
  3 + * dmyversion.c: empty load path in miniruby.
2 4
3 5 * common.mk (COMPILE_PRELUDE): rbconfig is loaded on demand.
4 6
5 common.mk
@@ -25,7 +25,7 @@ NORMALMAINOBJ = main.$(OBJEXT)
25 25 MAINOBJ = $(NORMALMAINOBJ)
26 26 EXTOBJS =
27 27 DLDOBJS = $(DMYEXT)
28   -MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT)
  28 +MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmyversion.$(OBJEXT) miniprelude.$(OBJEXT)
29 29 ENC_MK = enc.mk
30 30
31 31 COMMONOBJS = array.$(OBJEXT) \
@@ -75,7 +75,6 @@ COMMONOBJS = array.$(OBJEXT) \
75 75 transcode.$(OBJEXT) \
76 76 util.$(OBJEXT) \
77 77 variable.$(OBJEXT) \
78   - version.$(OBJEXT) \
79 78 compile.$(OBJEXT) \
80 79 debug.$(OBJEXT) \
81 80 iseq.$(OBJEXT) \
@@ -89,6 +88,7 @@ COMMONOBJS = array.$(OBJEXT) \
89 88
90 89 EXPORTOBJS = dln.$(OBJEXT) \
91 90 encoding.$(OBJEXT) \
  91 + version.$(OBJEXT) \
92 92 $(COMMONOBJS)
93 93
94 94 OBJS = $(EXPORTOBJS) prelude.$(OBJEXT)
@@ -632,6 +632,7 @@ variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \
632 632 {$(VPATH)}oniguruma.h
633 633 version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
634 634 {$(VPATH)}version.h $(srcdir)/revision.h {$(VPATH)}config.h
  635 +dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
635 636
636 637 compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
637 638 $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
2  dmyversion.c
... ... @@ -0,0 +1,2 @@
  1 +#define NO_INITIAL_LOAD_PATH 1
  2 +#include "version.c"
2  version.c
@@ -56,6 +56,7 @@ const char ruby_copyright[] = RUBY_COPYRIGHT;
56 56 const char ruby_engine[] = "ruby";
57 57
58 58 const char ruby_initial_load_paths[] =
  59 +#ifndef NO_INITIAL_LOAD_PATH
59 60 #ifdef RUBY_SEARCH_PATH
60 61 RUBY_SEARCH_PATH "\0"
61 62 #endif
@@ -78,6 +79,7 @@ const char ruby_initial_load_paths[] =
78 79 RUBY_THIN_ARCHLIB "\0"
79 80 #endif
80 81 RUBY_ARCHLIB "\0"
  82 +#endif
81 83 "";
82 84
83 85 void

0 comments on commit 26051e1

Please sign in to comment.
Something went wrong with that request. Please try again.