From ddac25ead8e420f43156f5ea4bd324d87a8b529f Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 22 Sep 2016 19:33:06 -0400 Subject: [PATCH] Fix GCC attempting to use -stdlib=libc++ --- cryptest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cryptest.sh b/cryptest.sh index b77115b7..74b3af91 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -4145,7 +4145,7 @@ fi ############################################ # Darwin, c++03, libc++ -if [[ ("$IS_DARWIN" -ne "0") && ("$HAVE_CXX03" -ne "0") ]]; then +if [[ ("$IS_DARWIN" -ne "0") && ("$HAVE_CXX03" -ne "0" && "$CLANG_COMPILER" -ne "0") ]]; then echo echo "************************************" | tee -a "$TEST_RESULTS" echo "Testing: Darwin, c++03, libc++ (LLVM)" | tee -a "$TEST_RESULTS" @@ -4201,7 +4201,7 @@ fi ############################################ # Darwin, c++11, libc++ -if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX11" -ne "0") ]]; then +if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX11" -ne "0" && "$CLANG_COMPILER" -ne "0") ]]; then echo echo "************************************" | tee -a "$TEST_RESULTS" echo "Testing: Darwin, c++11, libc++ (LLVM)" | tee -a "$TEST_RESULTS" @@ -4257,7 +4257,7 @@ fi ############################################ # Darwin, c++14, libc++ -if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX14" -ne "0") ]]; then +if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX14" -ne "0" && "$CLANG_COMPILER" -ne "0") ]]; then echo echo "************************************" | tee -a "$TEST_RESULTS" echo "Testing: Darwin, c++14, libc++ (LLVM)" | tee -a "$TEST_RESULTS" @@ -4313,7 +4313,7 @@ fi ############################################ # Darwin, c++17, libc++ -if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX17" -ne "0") ]]; then +if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX17" -ne "0" && "$CLANG_COMPILER" -ne "0") ]]; then echo echo "************************************" | tee -a "$TEST_RESULTS" echo "Testing: Darwin, c++17, libc++ (LLVM)" | tee -a "$TEST_RESULTS"