summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md4
-rw-r--r--include/mruby/value.h4
-rw-r--r--tasks/toolchains/clang.rake3
3 files changed, 5 insertions, 6 deletions
diff --git a/README.md b/README.md
index 0f247699f..7386f28bb 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,7 @@ following command:
## mruby home-page
-mruby's website is not launched yet but we are actively working on it.
-
-The URL of the mruby home-page will be:
+The URL of the mruby home-page is:
http://www.mruby.org/
diff --git a/include/mruby/value.h b/include/mruby/value.h
index a0f0c2ef9..562817678 100644
--- a/include/mruby/value.h
+++ b/include/mruby/value.h
@@ -100,7 +100,7 @@ enum mrb_vtype {
MRB_TT_SYMBOL, /* 5 */
MRB_TT_UNDEF, /* 6 */
MRB_TT_FLOAT, /* 7 */
- MRB_TT_CPTR, /* 8 */
+ MRB_TT_CPTR, /* 8 */
MRB_TT_OBJECT, /* 9 */
MRB_TT_CLASS, /* 10 */
MRB_TT_MODULE, /* 11 */
@@ -196,7 +196,7 @@ enum mrb_vtype {
MRB_TT_SYMBOL, /* 4 */
MRB_TT_UNDEF, /* 5 */
MRB_TT_FLOAT, /* 6 */
- MRB_TT_CPTR, /* 7 */
+ MRB_TT_CPTR, /* 7 */
MRB_TT_OBJECT, /* 8 */
MRB_TT_CLASS, /* 9 */
MRB_TT_MODULE, /* 10 */
diff --git a/tasks/toolchains/clang.rake b/tasks/toolchains/clang.rake
index d5d2ccd7c..ea92b516d 100644
--- a/tasks/toolchains/clang.rake
+++ b/tasks/toolchains/clang.rake
@@ -1,8 +1,9 @@
MRuby::Toolchain.new(:clang) do |conf|
toolchain :gcc
- [conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc|
+ [conf.cc, conf.objc, conf.asm].each do |cc|
cc.command = ENV['CC'] || 'clang'
end
+ conf.cxx.command = ENV['CXX'] || 'clang++'
conf.linker.command = ENV['LD'] || 'clang'
end