зеркало из https://github.com/github/ruby.git
* 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:
Родитель
ecc775772a
Коммит
26051e1d06
|
@ -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.
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
#define NO_INITIAL_LOAD_PATH 1
|
||||
#include "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
|
||||
|
|
Загрузка…
Ссылка в новой задаче