about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-05-09 00:37:43 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-05-09 00:37:43 +0530
commitf7980a3aabb9fe9b0142229b4adec7cff497bdf8 (patch)
treea93b09c1737cd31a316dc693e297915e6d88b1a4
parent4b4cb86248ef3540fd531a25d53c13069887a018 (diff)
parent468cb052b8e104f3c79dbb522b57a504f52ba1c1 (diff)
downloadrust-f7980a3aabb9fe9b0142229b4adec7cff497bdf8.tar.gz
rust-f7980a3aabb9fe9b0142229b4adec7cff497bdf8.zip
Rollup merge of #25198 - carols10cents:update-configure-osx, r=alexcrichton
Tiny tiny nitpick that I just noticed after getting a new laptop ( :beer: + :computer: = :angel: ) and thus needing to ./configure anew on Yosemite. 

It's weird to see a message that says you're on 10.9 if you're on 10.10, in a oh-i-wonder-what-else-is-wrong sort of sense-- easy fix with a `>=` since `gcc --version` on 10.10 with the newest xcode still says it's clang.

:heart: 
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 9aebfe07967..f0cba4b0c6a 100755
--- a/configure
+++ b/configure
@@ -844,7 +844,7 @@ then
     CFG_OSX_GCC_VERSION=$("$CFG_GCC" --version 2>&1 | grep "Apple LLVM version")
     if [ $? -eq 0 ]
     then
-        step_msg "on OS X 10.9, forcing use of clang"
+        step_msg "on OS X >=10.9, forcing use of clang"
         CFG_ENABLE_CLANG=1
     else
         if [ $("$CFG_GCC" --version 2>&1 | grep -c ' 4\.[0-6]') -ne 0 ]; then