From 67f562a417e988d06c1d81885d8f3ab271cbf85d Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 16 May 2013 07:54:04 +0000 Subject: [PATCH] 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 --- Makefile.in | 5 +++++ common.mk | 3 --- 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' diff --git a/common.mk b/common.mk index 86021554af..76f4c9a2a6 100644 --- a/common.mk +++ b/common.mk @@ -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'