diff options
Diffstat (limited to 'tasks/toolchains')
| -rw-r--r-- | tasks/toolchains/android.rake | 4 | ||||
| -rw-r--r-- | tasks/toolchains/gcc.rake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tasks/toolchains/android.rake b/tasks/toolchains/android.rake index c7df9ef80..0ac4d000c 100644 --- a/tasks/toolchains/android.rake +++ b/tasks/toolchains/android.rake @@ -67,7 +67,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter end def home_path - @home_path ||= Pathname( + @home_path ||= Pathname.new( params[:ndk_home] || ENV['ANDROID_NDK_HOME'] || DEFAULT_NDK_HOMES.find { |path| @@ -124,7 +124,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter path = home_path.join('toolchains', 'llvm' , 'prebuilt', 'windows*') Dir.glob(path.to_s){ |item| next if File.file?(item) - path = Pathname(item) + path = Pathname.new(item) break } path.basename diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake index 1a28026bf..e9ea2550c 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake @@ -15,7 +15,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| compiler.option_include_path = '-I%s' compiler.option_define = '-D%s' compiler.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}' - compiler.cxx_compile_flag = '-x c++ -std=c++03' + compiler.cxx_compile_flag = '-x c++ -std=gnu++03' compiler.cxx_exception_flag = '-fexceptions' compiler.cxx_invalid_flags = c_mandatory_flags + cxx_invalid_flags end |