summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-23 15:22:58 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-23 15:22:58 +0000
commitc5712c91b9d00e102d07a4b207f5f22867a386cd (patch)
tree562d1048e7de01c4895efc21c1c5f768cd2fdc2d
parent7577e786343acfae01dd0823f8f3cdb04de62316 (diff)
* Makefile.in, common.mk: move common-srcs to Makefile.in because
it breaks build on mswin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
-rw-r--r--common.mk2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c3845bf16b..8a9b4928cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 24 00:21:44 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * Makefile.in, common.mk: move common-srcs to Makefile.in because
+ it breaks build on mswin.
+
Wed Dec 24 00:04:45 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/open-uri.rb (OpenURI.open_http): accept multiple certs path in
diff --git a/Makefile.in b/Makefile.in
index 8a7707a81f..177fb43a4e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -438,7 +438,7 @@ enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
up::
@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
-after-update:: update-config_files
+after-update:: update-config_files common-srcs
update-mspec:
@$(CHDIR) $(srcdir); \
diff --git a/common.mk b/common.mk
index 6a878bcfc5..76ab061555 100644
--- a/common.mk
+++ b/common.mk
@@ -903,7 +903,7 @@ up::
up::
-$(Q)$(MAKE) $(MFLAGS) after-update
-after-update:: update-unicode update-gems common-srcs extract-extlibs
+after-update:: update-unicode update-gems extract-extlibs
update-config_files: PHONY
$(Q) $(BASERUBY) -C "$(srcdir)/tool" \