Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* 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 with 10 additions and 3 deletions.
  1. +3 −1 ChangeLog
  2. +3 −2 common.mk
  3. +2 −0  dmyversion.c
  4. +2 −0  version.c
4 ChangeLog
View
@@ -1,4 +1,6 @@
-Mon Feb 8 16:23:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 8 16:27:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dmyversion.c: empty load path in miniruby.
* common.mk (COMPILE_PRELUDE): rbconfig is loaded on demand.
5 common.mk
View
@@ -25,7 +25,7 @@ NORMALMAINOBJ = main.$(OBJEXT)
MAINOBJ = $(NORMALMAINOBJ)
EXTOBJS =
DLDOBJS = $(DMYEXT)
-MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT)
+MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmyversion.$(OBJEXT) miniprelude.$(OBJEXT)
ENC_MK = enc.mk
COMMONOBJS = array.$(OBJEXT) \
@@ -75,7 +75,6 @@ COMMONOBJS = array.$(OBJEXT) \
transcode.$(OBJEXT) \
util.$(OBJEXT) \
variable.$(OBJEXT) \
- version.$(OBJEXT) \
compile.$(OBJEXT) \
debug.$(OBJEXT) \
iseq.$(OBJEXT) \
@@ -89,6 +88,7 @@ COMMONOBJS = array.$(OBJEXT) \
EXPORTOBJS = dln.$(OBJEXT) \
encoding.$(OBJEXT) \
+ version.$(OBJEXT) \
$(COMMONOBJS)
OBJS = $(EXPORTOBJS) prelude.$(OBJEXT)
@@ -632,6 +632,7 @@ variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \
{$(VPATH)}oniguruma.h
version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
{$(VPATH)}version.h $(srcdir)/revision.h {$(VPATH)}config.h
+dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
$(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
2  dmyversion.c
View
@@ -0,0 +1,2 @@
+#define NO_INITIAL_LOAD_PATH 1
+#include "version.c"
2  version.c
View
@@ -56,6 +56,7 @@ const char ruby_copyright[] = RUBY_COPYRIGHT;
const char ruby_engine[] = "ruby";
const char ruby_initial_load_paths[] =
+#ifndef NO_INITIAL_LOAD_PATH
#ifdef RUBY_SEARCH_PATH
RUBY_SEARCH_PATH "\0"
#endif
@@ -78,6 +79,7 @@ const char ruby_initial_load_paths[] =
RUBY_THIN_ARCHLIB "\0"
#endif
RUBY_ARCHLIB "\0"
+#endif
"";
void
Please sign in to comment.
Something went wrong with that request. Please try again.