summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-19 07:08:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-19 07:08:13 +0000
commita824a6187d202ba57bcdf874c53606c103c357e4 (patch)
tree8deb6de4d5c8fb1197d1fa7059916c109bd12235
parentb999f95e707f57e3732b873113c35fa688e5d6ea (diff)
common.mk: no purelib
* common.mk (RUBYLIB): purelib option in runruby.rb is deprecated since r28841, so set to an empty list to get rid of a bogus path in child processes, which caused an insecure operation exception in test/ruby/test_encoding.rb:test_unsafe. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.in1
-rw-r--r--common.mk2
-rw-r--r--win32/Makefile.sub1
4 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a6ac2a3be3..947cf20e63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 19 16:08:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (RUBYLIB): purelib option in runruby.rb is deprecated
+ since r28841, so set to an empty list to get rid of a bogus path in
+ child processes, which caused an insecure operation exception in
+ test/ruby/test_encoding.rb:test_unsafe.
+
Mon Nov 19 15:40:50 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
* .travis.yml (script): add OPTS=-v, requested by @_ko1.
diff --git a/Makefile.in b/Makefile.in
index 229ef6b0fe..78d7139353 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,7 @@ RUNCMD = $(SHELL)
CHDIR = @CHDIR@
exec = exec
NULL = /dev/null
+PATH_SEPARATOR = @PATH_SEPARATOR@
#### Start of system configuration section. ####
diff --git a/common.mk b/common.mk
index af0dae63b4..a8450a05b9 100644
--- a/common.mk
+++ b/common.mk
@@ -10,7 +10,7 @@ Q1 = $(V:1=)
Q = $(Q1:0=@)
ECHO = $(ECHO1:0=@echo)
-RUBYLIB = -
+RUBYLIB = $(PATH_SEPARATOR)
RUBYOPT = -
RUN_OPTS = --disable-gems
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index dd9048cc11..b5b75f2f7f 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -6,6 +6,7 @@ RUNCMD = $(COMSPEC) /c
MKFILES = Makefile
NULL = nul
CHDIR = cd
+PATH_SEPARATOR = ;
!ifndef MFLAGS
MFLAGS=-l