diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 10:58:32 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 10:58:32 +0000 |
commit | 538ba389836b090be5c913cdfe820d3d3f626e2b (patch) | |
tree | 309eab328f2ee38abe3abd515594e10237bd4fc0 | |
parent | e9ce3e744dca3911153ba97b89cba7e7e20b8a5d (diff) |
merge revision(s) 53400: [Backport #13572]
* 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/branches/ruby_2_3@59222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | tool/mkconfig.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Jun 30 19:58:16 2017 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 Jun 30 19:56:06 2017 Eric Wong <e@80x24.org> * variable.c (check_autoload_required): do not assume a provided feature 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" @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.5" #define RUBY_RELEASE_DATE "2017-06-30" -#define RUBY_PATCHLEVEL 318 +#define RUBY_PATCHLEVEL 319 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 6 |