[llvm-branch-commits] [llvm-branch] r142490 - in /llvm/branches/release_30: ./ utils/release/test-release.sh

Bill Wendling isanbard at gmail.com
Wed Oct 19 02:47:36 PDT 2011


Author: void
Date: Wed Oct 19 04:47:36 2011
New Revision: 142490

URL: http://llvm.org/viewvc/llvm-project?rev=142490&view=rev
Log:
Merging r142489:
------------------------------------------------------------------------
r142489 | void | 2011-10-19 02:47:00 -0700 (Wed, 19 Oct 2011) | 1 line

Duncan pointed out that sometimes CC and CXX are used to specify the compiler. Also that the configure script takes care of finding an appropriate compiler if one's not specified.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_30/   (props changed)
    llvm/branches/release_30/utils/release/test-release.sh

Propchange: llvm/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 04:47:36 2011
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142243,142482,142486
+/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142243,142482,142486,142489

Modified: llvm/branches/release_30/utils/release/test-release.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_30/utils/release/test-release.sh?rev=142490&r1=142489&r2=142490&view=diff
==============================================================================
--- llvm/branches/release_30/utils/release/test-release.sh (original)
+++ llvm/branches/release_30/utils/release/test-release.sh Wed Oct 19 04:47:36 2011
@@ -141,26 +141,8 @@
 mkdir -p $LogDir
 
 # Find a compilers.
-c_compiler="`which clang`"
-if [ -z "$c_compiler" ]; then
-    c_compiler="`which gcc`"
-    if [ -z "$c_compiler" ]; then
-        c_compiler="`which cc`"
-        if [ -z "$c_compiler" ]; then
-            echo "error: cannot find a working C compiler"
-        fi
-    fi
-fi
-cxx_compiler="`which clang++`"
-if [ -z "$cxx_compiler" ]; then
-    cxx_compiler="`which g++`"
-    if [ -z "$cxx_compiler" ]; then
-        cxx_compiler="`which c++`"
-        if [ -z "$cxx_compiler" ]; then
-            echo "error: cannot find a working C++ compiler"
-        fi
-    fi
-fi
+c_compiler="$CC"
+cxx_compiler="$CXX"
 
 # Make sure that the URLs are valid.
 function check_valid_urls() {





More information about the llvm-branch-commits mailing list