<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/e4757ceb33b359e5dacca9af0460b4318e74da07">https://github.com/macports/macports-ports/commit/e4757ceb33b359e5dacca9af0460b4318e74da07</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new e4757ceb33b bazel PG: Clean up MP clang toolkit check proc
</span>e4757ceb33b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e4757ceb33b359e5dacca9af0460b4318e74da07
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Mar 27 17:04:38 2021 +0000

<span style='display:block; white-space:pre;color:#404040;'>    bazel PG: Clean up MP clang toolkit check proc
</span>---
 _resources/port1.0/group/bazel-1.0.tcl | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/bazel-1.0.tcl b/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c5daf0d3dc4..1837f0a9997 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,16 +58,18 @@ default bazel.configure_pre_args ""
</span> 
 proc bazel::use_mp_clang {} {
     global configure.compiler xcodeversion
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    return [ expr ( [ string match macports-clang-* ${configure.compiler} ] || [ vercmp ${xcodeversion} [option bazel.min_xcode] ] < 0 ) ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set is_mp_clang  [ expr { [ string match macports-clang-* ${configure.compiler} ] } ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set xcode_not_ok [ expr { ${xcodeversion} ne "none" && [ vercmp ${xcodeversion} [option bazel.min_xcode] ] < 0 } ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    return ${is_mp_clang} || ${xcode_not_ok}
</span> }
 
 # Required java version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version        11+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version         11+
</span> # LTS JDK port to install if required java not found
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.fallback       openjdk11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback        openjdk11
</span> # JDK only needed at build time, but java PG sets lib dependency so
 # declare no conflict to allow redistribution of binaries.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict  ${java.fallback}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict   ${java.fallback}
</span> # append to envs
 configure.env-append JAVA_HOME=${java.home}
 build.env-append     JAVA_HOME=${java.home}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,7 +196,7 @@ proc bazel::get_cmd_opts {} {
</span> 
 proc bazel::get_build_opts {} {
     global build.jobs configure.cc configure.cxx configure.cflags configure.cxxflags configure.ldflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    global use_parallel_build bazel.limit_build_jobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global configure.sdk_version use_parallel_build bazel.limit_build_jobs
</span>     # Bazel build options
     # See https://docs.bazel.build/versions/master/memory-saving-mode.html 
     set bazel_build_opts "--subcommands --compilation_mode=opt --verbose_failures --nouse_action_cache --discard_analysis_cache --notrack_incremental_state --nokeep_state_after_build "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -230,6 +232,11 @@ proc bazel::get_build_opts {} {
</span>     }
     if { [bazel::use_mp_clang] } {
         set bazel_build_opts "${bazel_build_opts} --action_env CC=${configure.cc} --action_env CXX=${configure.cxx}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Explicitly pass SDK                    https://github.com/bazelbuild/rules_go/issues/1554
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Check versioned SDK actually exists... https://trac.macports.org/ticket/60317
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Incorrect SDK choice                   https://trac.macports.org/ticket/62570
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # set bazel_build_opts "${bazel_build_opts} --macos_sdk_version=${configure.sdk_version}"
</span>     }
     if {[variant_isset mkl]} {
         set bazel_build_opts "${bazel_build_opts} --config=mkl"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,6 +254,7 @@ proc bazel::get_build_opts {} {
</span> proc bazel::configure_build {} {
     if { [option bazel.build_cmd] ne "" } {
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        global configure.sdkroot
</span>         global bazel.build_cmd bazel.build_opts bazel.build_target
         global build.jobs build.cmd build.args build.post_args
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -255,6 +263,8 @@ proc bazel::configure_build {} {
</span>         set bazel_build_env ""
         if { [bazel::use_mp_clang] } {
             set bazel_build_env "BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 ${bazel_build_env}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            #set bazel_build_env "SDKROOT=${configure.sdkroot} ${bazel_build_env}"
</span>         }
         if {![variant_isset native]} {
             set base_march [bazel::get_base_arch]
</pre><pre style='margin:0'>

</pre>