diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-14 08:32:15 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-14 08:32:15 +0000 |
commit | e427c207b96272938ea208988cd05b09cdbc5ab0 (patch) | |
tree | 0e5f4845b049888eaa1553347a5239993b205396 | |
parent | 1d4e5849e1b8968cf2160ff886ffb0f274df1c79 (diff) | |
download | ruby-e427c207b96272938ea208988cd05b09cdbc5ab0.tar.gz |
mkmf.rb: Do not modify caller strings
* lib/mkmf.rb (with_{cpp,c,ld}flags): copy caller strings not to
be modified, in append_{cpp,c,ld}flags respectively.
[Fix GH-1246]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/mkmf.rb | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sun Feb 14 17:31:50 2016 Lars Kanis <lars@greiz-reinsdorf.de> + + * lib/mkmf.rb (with_{cpp,c,ld}flags): copy caller strings not to + be modified, in append_{cpp,c,ld}flags respectively. + [Fix GH-1246] + Sun Feb 14 16:18:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (setup_exception): set the cause only if it is explicitly diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 924ca2f019..6e23db8575 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -603,7 +603,7 @@ MSG def with_cppflags(flags) cppflags = $CPPFLAGS - $CPPFLAGS = flags + $CPPFLAGS = flags.dup ret = yield ensure $CPPFLAGS = cppflags unless ret @@ -625,7 +625,7 @@ MSG def with_cflags(flags) cflags = $CFLAGS - $CFLAGS = flags + $CFLAGS = flags.dup ret = yield ensure $CFLAGS = cflags unless ret @@ -647,7 +647,7 @@ MSG def with_ldflags(flags) ldflags = $LDFLAGS - $LDFLAGS = flags + $LDFLAGS = flags.dup ret = yield ensure $LDFLAGS = ldflags unless ret |