From 26051e1d06f128fa2201d01936761634e8925c8e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 8 Feb 2010 07:28:00 +0000
Subject: * dmyversion.c: empty load path in miniruby.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 4 +++-
 common.mk    | 5 +++--
 dmyversion.c | 2 ++
 version.c    | 2 ++
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 dmyversion.c

diff --git a/ChangeLog b/ChangeLog
index dd142520c5..905fa8b38e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 
diff --git a/common.mk b/common.mk
index 0c31756996..74f9ff759f 100644
--- a/common.mk
+++ b/common.mk
@@ -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 \
diff --git a/dmyversion.c b/dmyversion.c
new file mode 100644
index 0000000000..279c6ea95a
--- /dev/null
+++ b/dmyversion.c
@@ -0,0 +1,2 @@
+#define NO_INITIAL_LOAD_PATH 1
+#include "version.c"
diff --git a/version.c b/version.c
index 455c037b34..fcd0fcdd90 100644
--- a/version.c
+++ b/version.c
@@ -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
-- 
cgit v1.2.3