diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-21 23:09:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-21 23:09:49 +0000 |
| commit | c721174ff0aadd59760bebc1169c484780d2e16e (patch) | |
| tree | bb8b59e11d0dca301c72ab0c35d7b44654b14686 | |
| parent | 9f2922bdcd27453bf5814f4d8703ee55635ed033 (diff) | |
common.mk: strip autogenerated dependencies
* common.mk (ext/ripper/ripper.c, ext/rbconfig/sizeof/sizes.c):
strip autogenerated dependencies which have invalid syntax in
other than nmake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | common.mk | 11 |
2 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sun Mar 22 08:09:47 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (ext/ripper/ripper.c, ext/rbconfig/sizeof/sizes.c): + strip autogenerated dependencies which have invalid syntax in + other than nmake. + Sat Mar 21 15:01:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/io/console/console.c (console_set_winsize): use handle for @@ -835,9 +835,10 @@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastr $(srcdir)/ext/ripper/ripper.c: parse.y id.h $(ECHO) generating $@ - $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \ - Q=$(Q) ECHO=$(ECHO) RM="$(RM)" VPATH="$(PWD)" \ - top_srcdir=../.. srcdir=. \ + $(Q) $(CHDIR) $(@D) && \ + sed /AUTOGENERATED/q depend | \ + $(exec) $(MAKE) -f - $(MFLAGS) \ + Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH=../.. \ RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl @@ -848,7 +849,9 @@ $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in $(ECHO) generating $@ - $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \ + $(Q) $(CHDIR) $(@D) && \ + sed /AUTOGENERATED/q depend | \ + $(exec) $(MAKE) -f - $(MFLAGS) \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" ## |