diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-08 06:30:32 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-08 06:30:32 +0000 |
| commit | db24cb705dd1337129909ccd5923db0ebf695a13 (patch) | |
| tree | 070f20b59e33600c03da27331fad8fc9f36b1a46 | |
| parent | 53662a711f616826be4ca8c9ebc74ba2f70102c1 (diff) | |
| download | ruby-db24cb705dd1337129909ccd5923db0ebf695a13.tar.gz | |
miniinit.c: minimum built-in encodings in miniruby
* common.mk (MINIOBJS): no longer need dmyenc.o.
* miniinit.c (Init_enc): declare minimum built-in encodings so
that these Encoding constants will be available in miniruby.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | miniinit.c | 9 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 2afea66b8b..a2645d0e79 100644 --- a/Makefile.in +++ b/Makefile.in @@ -216,7 +216,7 @@ all: miniruby$(EXEEXT): @-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi $(ECHO) linking $@ - $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@ $(PROGRAM): @$(RM) $@ @@ -39,7 +39,7 @@ NORMALMAINOBJ = main.$(OBJEXT) MAINOBJ = $(NORMALMAINOBJ) DLDOBJS = $(INITOBJS) EXTSOLIBS = -MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT) miniprelude.$(OBJEXT) +MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT) ENC_MK = enc.mk COMMONOBJS = array.$(OBJEXT) \ diff --git a/miniinit.c b/miniinit.c index bc6138a774..0e05cd0a94 100644 --- a/miniinit.c +++ b/miniinit.c @@ -28,3 +28,12 @@ Init_enc_set_filesystem_encoding(void) { return rb_enc_to_index(rb_default_external_encoding()); } + +void +Init_enc(void) +{ + void rb_encdb_declare(const char *name); + rb_encdb_declare("ASCII-8BIT"); + rb_encdb_declare("US-ASCII"); + rb_encdb_declare("UTF-8"); +} diff --git a/win32/Makefile.sub b/win32/Makefile.sub index cbf2acd270..235dc9b9b3 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -941,7 +941,7 @@ miniruby: miniruby$(EXEEXT) miniruby$(EXEEXT): @echo $(LIBS) $(ECHO) linking $(@:\=/) - $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) $(LIBS) -Fe$@ -link $(LDFLAGS) + $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(LIBS) -Fe$@ -link $(LDFLAGS) @$(RM) miniruby.lib miniruby.exp $(Q) miniruby.exe -v $(Q) $(LDSHARED_1) |