[incubator-heron] branch master updated: Support Catalina for Mac (#3398)

[nw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new 909c7a0  Support Catalina for Mac (#3398)
909c7a0 is described below

commit 909c7a005f43ca826e9e1209ecb3fa0ae88bf1a8
Author: se choi <th...@gmail.com>
AuthorDate: Mon Nov 11 15:59:40 2019 +0900

    Support Catalina for Mac (#3398)
---
 bazel_configure.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bazel_configure.py b/bazel_configure.py
index ec254e5..02e67f1 100755
--- a/bazel_configure.py
+++ b/bazel_configure.py
@@ -191,7 +191,8 @@ def discover_version(path):
 
   # on mac, /usr/bin/cpp --version returns this:
   #   Apple LLVM version 6.0 (clang-600.0.56) (based on LLVM 3.5svn)
-  mac_line = re.search('^(Apple LLVM version\s+[\d\.]+)\s+\(clang.*', first_line)
+  #   Apple clang version 11.0.0 (clang-1100.0.33.12)
+  mac_line = re.search('^(Apple (LLVM|clang) version\s+[\d\.]+)\s+\(clang.*', first_line)
   if mac_line:
     version = get_trailing_version(mac_line.group(1))
     if version: