<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8094d5ccf53322914e0e2951f45f67a810671911">https://github.com/macports/macports-ports/commit/8094d5ccf53322914e0e2951f45f67a810671911</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8094d5ccf53322914e0e2951f45f67a810671911
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun May 10 15:01:35 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> bazel: check configure.compiler as well as Xcode version
</span>---
devel/bazel/Portfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bazel/Portfile b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b000baa..ab229d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,6 +121,8 @@ patch.pre_args -p1
</span> # The oldest Xcode version to use default Xcode compiler
# Note setting here should be in sync with that in py-tensorflow
set bazel_min_xcode 9.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Work out if we should be using macports clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set use_mp_clang [ expr ( [ string match macports-clang-* ${configure.compiler} ] || [ vercmp ${xcodeversion} ${bazel_min_xcode} ] < 0 ) ]
</span>
# Even though bazel can build without Xcode, mark use Xcode for now since it fails to
# build with tracemode on latest master if both CLT and Xcode are available.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,7 +197,7 @@ build.env-append CC=${configure.cc} \
</span> JAVA_HOME=${java.home}
# Disable Xcode detection on older OSes, as we want the
# MP provided commandline utilities to be used instead.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${xcodeversion} ${bazel_min_xcode}] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${use_mp_clang} } {
</span> build.env-append BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
}
</pre><pre style='margin:0'>
</pre>