Return-Path: X-Original-To: apmail-kudu-commits-archive@minotaur.apache.org Delivered-To: apmail-kudu-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 864F618F12 for ; Fri, 1 Apr 2016 03:16:09 +0000 (UTC) Received: (qmail 56487 invoked by uid 500); 1 Apr 2016 03:16:09 -0000 Delivered-To: apmail-kudu-commits-archive@kudu.apache.org Received: (qmail 56468 invoked by uid 500); 1 Apr 2016 03:16:09 -0000 Mailing-List: contact commits-help@kudu.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kudu.incubator.apache.org Delivered-To: mailing list commits@kudu.incubator.apache.org Received: (qmail 56459 invoked by uid 99); 1 Apr 2016 03:16:09 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Apr 2016 03:16:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 0E90BC031B for ; Fri, 1 Apr 2016 03:16:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id Vdh5taVreuz3 for ; Fri, 1 Apr 2016 03:16:04 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 19D5A5FAE7 for ; Fri, 1 Apr 2016 03:16:04 +0000 (UTC) Received: (qmail 56119 invoked by uid 99); 1 Apr 2016 03:16:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Apr 2016 03:16:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E546E07EF; Fri, 1 Apr 2016 03:16:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: adar@apache.org To: commits@kudu.incubator.apache.org Date: Fri, 01 Apr 2016 03:16:07 -0000 Message-Id: In-Reply-To: <0dab010d1c194fe39c5a949b9f2751d2@git.apache.org> References: <0dab010d1c194fe39c5a949b9f2751d2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/7] incubator-kudu git commit: Fix OSX build breakage with clang versions newer than 700 Fix OSX build breakage with clang versions newer than 700 Change-Id: I1c54ae7a7e2fe12b4d9d305f4dcd5343ffa6ba86 Reviewed-on: http://gerrit.cloudera.org:8080/2692 Reviewed-by: Dan Burkert Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/5eb9fcf9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/5eb9fcf9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/5eb9fcf9 Branch: refs/heads/master Commit: 5eb9fcf9ecc646c36c95c1fa041ee485c74824c8 Parents: 959952a Author: Misty Stanley-Jones Authored: Thu Mar 31 16:50:12 2016 -0700 Committer: Dan Burkert Committed: Fri Apr 1 01:19:31 2016 +0000 ---------------------------------------------------------------------- cmake_modules/CompilerInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/5eb9fcf9/cmake_modules/CompilerInfo.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/CompilerInfo.cmake b/cmake_modules/CompilerInfo.cmake index 66c0d7b..d77080c 100644 --- a/cmake_modules/CompilerInfo.cmake +++ b/cmake_modules/CompilerInfo.cmake @@ -33,7 +33,7 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*based on LLVM.*") COMPILER_VERSION "${COMPILER_VERSION_FULL}") # clang on Mac OS X, XCode 7. -elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-700\\..*") +elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-7") set(COMPILER_FAMILY "clang") set(COMPILER_VERSION "3.7.0svn")