summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 06:13:41 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 06:13:41 +0000
commit55058e3583a177ad86deef7c0128f777e4be0f24 (patch)
tree2601e1b715103ec4fdeeeff298e7edfc5f462ad0
parentb949447a495ee1438e6a483a20631ab855c7e68f (diff)
Revert r38301
"* common.mk ($(MINIPRELUDE_C)): -I may break make dist." This didn't solve the issue. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk2
2 files changed, 1 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 96c2d687a7..4ee29d8e5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,11 +4,6 @@ Tue Dec 11 12:00:19 2012 NARUSE, Yui <naruse@ruby-lang.org>
by Santiago Pastorino <santiago@wyeworks.com>
https://github.com/ruby/ruby/pull/221 fix GH-221
-Tue Dec 11 11:36:04 2012 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk ($(MINIPRELUDE_C)): -I may break make dist.
- patched by Vit Ondruch [Bug #7541] [ruby-core:50736]
-
Tue Dec 11 01:53:37 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/matrix: alias {row|column}_size to {row|column}_count and use
diff --git a/common.mk b/common.mk
index e8882ad5f2..b552ae7f3c 100644
--- a/common.mk
+++ b/common.mk
@@ -887,7 +887,7 @@ known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_
$(MINIPRELUDE_C): $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
$(ECHO) generating $@
- $(Q) $(BASERUBY) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+ $(Q) $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \
$(srcdir)/lib/rubygems/defaults.rb \