diff options
| author | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-06 15:15:07 +0000 |
|---|---|---|
| committer | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-06 15:15:07 +0000 |
| commit | e334bb2ce5d8876b020ab681f21595e2e1c9d601 (patch) | |
| tree | 71caf522afa33520e80288917bf7257e66ae20a9 /common.mk | |
| parent | f43d9e22f688751479bc5c9d85f056091145c960 (diff) | |
* common.mk: use RUNRUBY instead of MINIRUBY because MINIRUBY can't
require extension libraries. The patch is from nobu
(Nobuyoshi Nakada).
* ext/thread/extconf.rb: for build ext/thread/thread.c.
* include/ruby/intern.h: ditto.
* thread.c: ditto.
* lib/thread.rb: removed and replaced by ext/thread/thread.c.
* ext/thread/thread.c: Queue, SizedQueue and ConditionVariable
implementations in C. This patch is based on patches from panaggio
(Ricardo Panaggio) and funny_falcon (Yura Sokolov) and ko1
(Koichi Sasada). [ruby-core:31513] [Feature #3620]
* test/thread/test_queue.rb (test_queue_thread_raise): add a test for
ensuring that killed thread should be removed from waiting threads.
It is based on a code by ko1 (Koichi Sasada). [ruby-core:45950]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -123,7 +123,7 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --make-flags="$(MAKEFLAGS)" EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \ --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" -- -INSTRUBY = $(SUDO) $(MINIRUBY) $(srcdir)/tool/rbinstall.rb +INSTRUBY = $(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb INSTRUBY_ARGS = $(SCRIPT_ARGS) \ --data-mode=$(INSTALL_DATA_MODE) \ --prog-mode=$(INSTALL_PROG_MODE) \ @@ -449,7 +449,7 @@ post-no-install-doc:: CLEAR_INSTALLED_LIST = clear-installed-list -install-prereq: $(CLEAR_INSTALLED_LIST) PHONY +install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake PHONY clear-installed-list: PHONY @> $(INSTALLED_LIST) set MAKE="$(MAKE)" |