summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-01-15 11:00:05 +0900
committerGitHub <[email protected]>2019-01-15 11:00:05 +0900
commit127d355bf8eed22281aed3b6660f18c14e58f55a (patch)
tree3da18e0faabaaef8812cf2e7f6610e9c60a2e4dd
parent4797542b71236134917ccfea02965a5e2c0f6010 (diff)
parenta7c2ef9dab4e5c28120bfb7a9b8fca332129bdde (diff)
downloadmruby-127d355bf8eed22281aed3b6660f18c14e58f55a.tar.gz
mruby-127d355bf8eed22281aed3b6660f18c14e58f55a.zip
Merge pull request #4226 from dearblue/fix-build-cxx-exc
Build fails when set `conf.build_dir=<rel path>` and `conf.enable_cxx_exception`
-rw-r--r--lib/mruby/build.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index e2d9fc41e..63125d4fa 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -162,8 +162,6 @@ module MRuby
end
def compile_as_cxx src, cxx_src, obj = nil, includes = []
- src = File.absolute_path src
- cxx_src = File.absolute_path cxx_src
obj = objfile(cxx_src) if obj.nil?
file cxx_src => [src, __FILE__] do |t|
@@ -175,7 +173,7 @@ module MRuby
#ifndef MRB_ENABLE_CXX_ABI
extern "C" {
#endif
-#include "#{src}"
+#include "#{File.absolute_path src}"
#ifndef MRB_ENABLE_CXX_ABI
}
#endif