ruby-changes:73974
From: Nobuyoshi <ko1@a...>
Date: Thu, 13 Oct 2022 12:25:43 +0900 (JST)
Subject: [ruby-changes:73974] c50623f093 (master): Revert "FreeBSD make uses the target under srcdir [ci skip]"
https://git.ruby-lang.org/ruby.git/commit/?id=c50623f093 From c50623f0934ec0b94550fa59a2b0ffcb1b0f858f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Thu, 13 Oct 2022 12:24:59 +0900 Subject: Revert "FreeBSD make uses the target under srcdir [ci skip]" This reverts commit 751ffb276f658518c6fe06461a9d3d1c136c7d5d, which caused build failures on other platforms. --- tool/ruby_vm/helpers/dumper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 tool/ruby_vm/helpers/dumper.rb diff --git a/tool/ruby_vm/helpers/dumper.rb b/tool/ruby_vm/helpers/dumper.rb old mode 100755 new mode 100644 index 150a81f04b..c083dffa7a --- a/tool/ruby_vm/helpers/dumper.rb +++ b/tool/ruby_vm/helpers/dumper.rb @@ -28,7 +28,7 @@ class RubyVM::Dumper https://github.com/ruby/ruby/blob/trunk/tool/ruby_vm/helpers/dumper.rb#L28 path = Pathname.new(__FILE__) path = (path.relative_path_from(Pathname.pwd) rescue path).dirname path += '../views' - path += Pathname.pwd.join(File.basename(spec)).expand_path.to_s.sub("#{@base}/", '') + path += Pathname.pwd.join(spec).expand_path.to_s.sub("#{@base}/", '') src = path.expand_path.read mode: 'rt:utf-8:utf-8' rescue Errno::ENOENT raise "don't know how to generate #{path}" -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/