diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-01 01:27:30 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-01 01:27:30 +0000 |
| commit | 1ddab13b9d3965f5dac4f39bdbf9883ba8dfc7dd (patch) | |
| tree | 0aad5779cf821bf595ff7b1be1729f4b83e240a7 | |
| parent | 34cacd05816a10da27378d7fd5e1d0ff283a8931 (diff) | |
| download | ruby-1ddab13b9d3965f5dac4f39bdbf9883ba8dfc7dd.tar.gz | |
mkconfig.rb: SDKROOT
* tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir
not includedir, the latter is outside the ruby installation.
[ruby-core:72496] [Bug #11881]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Jan 1 10:27:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir + not includedir, the latter is outside the ruby installation. + [ruby-core:72496] [Bug #11881] + Fri Jan 1 08:53:02 2016 Yuki Kurihara <co000ri@gmail.com> * test/ruby/test_lazy_enumerator.rb (test_take_bad_arg): Add test diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index fdba7097d6..c14d1ef715 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -131,7 +131,7 @@ File.foreach "config.status" do |line| if universal val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}]) end - when /^includedir$/ + when /^oldincludedir$/ val = '"$(SDKROOT)"'+val if /darwin/ =~ arch end v = " CONFIG[\"#{name}\"] #{eq} #{val}\n" |