summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authordearblue <[email protected]>2021-02-06 17:27:23 +0900
committerdearblue <[email protected]>2021-02-06 17:27:23 +0900
commite0d2f4e0aece2c69c2938f83cf18cf33481a13fa (patch)
treea7bfd5ccba554b4a975b80c4b8cdda03da02e7c2 /lib
parent88113df0981142be989e868689bf549cb95f0e6c (diff)
downloadmruby-e0d2f4e0aece2c69c2938f83cf18cf33481a13fa.tar.gz
mruby-e0d2f4e0aece2c69c2938f83cf18cf33481a13fa.zip
`compile_as_cxx` should generate a path under` conf.build_dir`
If the current directory is different from `MRUBY_ROOT` and it has` conf.build_dir` and `conf.enable_cxx_exception` set, it was generating a pathname outside of` build_dir`. As a result, in some cases files unrelated to mruby could be linked. ```console % pwd /tmp/mruby/1/2/3/4/5/6 % mruby_dir=/tmp/mruby/a/b/c/d/mruby % cat my_config.rb MRuby::Build.new("host", "build/to/custom/directory") do toolchain enable_cxx_exception end % rake MRUBY_CONFIG=my_config.rb -f $mruby_dir/Rakefile > logs % grep CXX logs CXX a/b/c/d/mruby/src/error-cxx.cxx -> a/b/c/d/mruby/src/error-cxx.o CXX a/b/c/d/mruby/src/gc-cxx.cxx -> a/b/c/d/mruby/src/gc-cxx.o CXX a/b/c/d/mruby/src/vm-cxx.cxx -> a/b/c/d/mruby/src/vm-cxx.o CXX a/b/c/d/mruby/mrbgems/mruby-compiler/core/codegen-cxx.cxx -> a/b/c/d/mruby/mrbgems/mruby-compiler/core/codegen-cxx.o CXX a/b/c/d/mruby/mrbgems/mruby-compiler/core/y.tab-cxx.cxx -> a/b/c/d/mruby/mrbgems/mruby-compiler/core/y.tab-cxx.o CXX ../a/b/c/d/mruby/src/error-cxx.cxx -> ../a/b/c/d/mruby/src/error-cxx.o CXX ../a/b/c/d/mruby/src/gc-cxx.cxx -> ../a/b/c/d/mruby/src/gc-cxx.o CXX ../a/b/c/d/mruby/src/vm-cxx.cxx -> ../a/b/c/d/mruby/src/vm-cxx.o ```
Diffstat (limited to 'lib')
-rw-r--r--lib/mruby/build.rb2
-rw-r--r--lib/mruby/core_ext.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index a79732802..b9f26d49f 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -248,7 +248,7 @@ module MRuby
end
end
else
- cxx_src = "#{build_dir}/#{src.relative_path})".ext << "-cxx.cxx"
+ cxx_src = "#{build_dir}/#{src.relative_path.to_s.remove_leading_parents}".ext << "-cxx.cxx"
obj = cxx_src.ext(@exts.object)
end
diff --git a/lib/mruby/core_ext.rb b/lib/mruby/core_ext.rb
index 33454edad..1ad528c26 100644
--- a/lib/mruby/core_ext.rb
+++ b/lib/mruby/core_ext.rb
@@ -18,6 +18,10 @@ class String
def relative_path
relative_path_from(Dir.pwd)
end
+
+ def remove_leading_parents
+ Pathname.new(".#{Pathname.new("/#{self}").cleanpath}").cleanpath.to_s
+ end
end
def install_D(src, dst)