1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* dmyversion.c: empty load path in miniruby.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-02-08 07:28:00 +00:00
parent ecc775772a
commit 26051e1d06
4 changed files with 10 additions and 3 deletions

View file

@ -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. * common.mk (COMPILE_PRELUDE): rbconfig is loaded on demand.

View file

@ -25,7 +25,7 @@ NORMALMAINOBJ = main.$(OBJEXT)
MAINOBJ = $(NORMALMAINOBJ) MAINOBJ = $(NORMALMAINOBJ)
EXTOBJS = EXTOBJS =
DLDOBJS = $(DMYEXT) DLDOBJS = $(DMYEXT)
MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT) MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmyversion.$(OBJEXT) miniprelude.$(OBJEXT)
ENC_MK = enc.mk ENC_MK = enc.mk
COMMONOBJS = array.$(OBJEXT) \ COMMONOBJS = array.$(OBJEXT) \
@ -75,7 +75,6 @@ COMMONOBJS = array.$(OBJEXT) \
transcode.$(OBJEXT) \ transcode.$(OBJEXT) \
util.$(OBJEXT) \ util.$(OBJEXT) \
variable.$(OBJEXT) \ variable.$(OBJEXT) \
version.$(OBJEXT) \
compile.$(OBJEXT) \ compile.$(OBJEXT) \
debug.$(OBJEXT) \ debug.$(OBJEXT) \
iseq.$(OBJEXT) \ iseq.$(OBJEXT) \
@ -89,6 +88,7 @@ COMMONOBJS = array.$(OBJEXT) \
EXPORTOBJS = dln.$(OBJEXT) \ EXPORTOBJS = dln.$(OBJEXT) \
encoding.$(OBJEXT) \ encoding.$(OBJEXT) \
version.$(OBJEXT) \
$(COMMONOBJS) $(COMMONOBJS)
OBJS = $(EXPORTOBJS) prelude.$(OBJEXT) OBJS = $(EXPORTOBJS) prelude.$(OBJEXT)
@ -632,6 +632,7 @@ variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \
{$(VPATH)}oniguruma.h {$(VPATH)}oniguruma.h
version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \ version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
{$(VPATH)}version.h $(srcdir)/revision.h {$(VPATH)}config.h {$(VPATH)}version.h $(srcdir)/revision.h {$(VPATH)}config.h
dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \ compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
$(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \

2
dmyversion.c Normal file
View file

@ -0,0 +1,2 @@
#define NO_INITIAL_LOAD_PATH 1
#include "version.c"

View file

@ -56,6 +56,7 @@ const char ruby_copyright[] = RUBY_COPYRIGHT;
const char ruby_engine[] = "ruby"; const char ruby_engine[] = "ruby";
const char ruby_initial_load_paths[] = const char ruby_initial_load_paths[] =
#ifndef NO_INITIAL_LOAD_PATH
#ifdef RUBY_SEARCH_PATH #ifdef RUBY_SEARCH_PATH
RUBY_SEARCH_PATH "\0" RUBY_SEARCH_PATH "\0"
#endif #endif
@ -78,6 +79,7 @@ const char ruby_initial_load_paths[] =
RUBY_THIN_ARCHLIB "\0" RUBY_THIN_ARCHLIB "\0"
#endif #endif
RUBY_ARCHLIB "\0" RUBY_ARCHLIB "\0"
#endif
""; "";
void void