diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-16 07:54:04 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-16 07:54:04 +0000 |
commit | 67f562a417e988d06c1d81885d8f3ab271cbf85d (patch) | |
tree | cd1bb7e584041031e0e1e3089c3314545078c80d | |
parent | 87e352c5a3be4697c7783d311657de4e27666bf1 (diff) | |
download | ruby-67f562a417e988d06c1d81885d8f3ab271cbf85d.tar.gz |
Makefile.in: loadpath from loadpath.c
* Makefile.in (loadpath): $LOAD_PATH in miniruby is empty by default
now.
* win32/Makefile.sub (loadpath): separate for quirky cmd.exe syntax.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | Makefile.in | 5 | ||||
-rw-r--r-- | common.mk | 3 | ||||
-rw-r--r-- | win32/Makefile.sub | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index d5656ac1ac..b848ee64cf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -464,3 +464,8 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \ $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb $(ECHO) generating $@ $(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ + +loadpath: verconf.h + @$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \ + sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \ + -e '/^ /!d;s/ *"\\0"$$//;s/" *"//g' @@ -185,9 +185,6 @@ $(MKMAIN_CMD): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY) prog: program wprogram -loadpath: $(PREP) PHONY - $(MINIRUBY) -e 'p $$:' - $(PREP): $(MKFILES) miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE) $(DTRACE_OBJ) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index b4522ccacf..443861eb66 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1126,3 +1126,8 @@ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ ! if [del insns_rules.mk > nul] ! endif !endif + +loadpath: verconf.h + @$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \ + sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \ + -e '/^^ /!d;s/ *"\\\\0"$$//;s/" *"//g' |