fix compiler detections

rvm · Mar 31, 2013 · 0f0a1e3 · 0f0a1e3
1 parent 1b942a1
commit 0f0a1e3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/scripts/functions/build b/scripts/functions/build
@@ -82,23 +82,23 @@ __rvm_compiler_is_llvm()
 {
   typeset compiler
   compiler="${1:-$( __rvm_found_compiler )}" &&
-  __rvm_compiler_is "$compiler" "-version" llvm ||
+  __rvm_compiler_is "$compiler" "--version" llvm ||
   return $?
 }
 
 __rvm_compiler_is_gcc47()
 {
   typeset compiler
-  compiler="$( __rvm_found_compiler )" &&
+  compiler="${1:-$(  __rvm_found_compiler )}" &&
   __rvm_compiler_is "$compiler" "-dumpversion" "4.7" ||
   return $?
 }
 
 __rvm_compiler_is_gcc46_or_higher()
 {
   typeset __version compiler
-  compiler="$(  __rvm_found_compiler )" &&
-  __version="$( __rvm_run_compiler "$1" "-dumpversion" )" &&
+  compiler="${1:-$(  __rvm_found_compiler )}" &&
+  __version="$( __rvm_run_compiler "$compiler" "-dumpversion" )" &&
   __rvm_version_compare "${__version:-0}" -ge "4.6" ||
   return $?
 }