<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/951b108391b1fa9d386b85db98545008bc9f75ab">https://github.com/macports/macports-ports/commit/951b108391b1fa9d386b85db98545008bc9f75ab</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 951b108391b bazel PG: Fix various issues with use of MP clang
</span>951b108391b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 951b108391b1fa9d386b85db98545008bc9f75ab
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun May 2 19:00:07 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    bazel PG: Fix various issues with use of MP clang
</span>---
 _resources/port1.0/group/bazel-1.0.tcl | 37 +++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 16 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 ee66089b0f2..318d6365a0e 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;'>@@ -84,7 +84,7 @@ proc bazel::use_mp_clang {} {
</span>     global configure.compiler xcodeversion
     set is_mp_clang  [ expr { [ string match macports-clang-* ${configure.compiler} ] } ]
     set xcode_not_ok [ expr { ${xcodeversion} eq "none" || [ vercmp ${xcodeversion} [option bazel.min_xcode] ] < 0 } ]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    return ${is_mp_clang} || ${xcode_not_ok}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    return [ expr ${is_mp_clang} || ${xcode_not_ok} ]
</span> }
 
 # Xcode blacklist
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,7 +219,7 @@ pre-build {
</span>         return -code error "build error"
     }
     if { [option bazel.build_cmd] ne "" && [file exists ${worksrcpath}] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Create compiler wrappers 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Create compiler wrappers
</span>         set wrapdir ${workpath}/bazelwrap
         xinstall -m 755 -d ${wrapdir}
         foreach comp {cc cxx} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,7 +259,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 configure.sdk_version 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 workpath
</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;'>@@ -296,14 +296,19 @@ proc bazel::get_build_opts {} {
</span>     foreach opt [list {*}${configure.ldflags} ] {
         set bazel_build_opts "${bazel_build_opts} --linkopt \"${opt}\""
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if { [bazel::use_mp_clang] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set bazel_build_opts "${bazel_build_opts} --action_env CC=${configure.cc} --action_env CXX=${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Explicitly pass SDK                    https://github.com/bazelbuild/rules_go/issues/1554
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Check versioned SDK actually exists... https://trac.macports.org/ticket/60317
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Incorrect SDK choice                   https://trac.macports.org/ticket/62570
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # set bazel_build_opts "${bazel_build_opts} --macos_sdk_version=${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # if { [bazel::use_mp_clang] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #     if { [option bazel.build_cmd] ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #         set wrapdir ${workpath}/bazelwrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #         set bazel_build_opts "${bazel_build_opts} --action_env CC=${wrapdir}/cc --action_env CXX=${wrapdir}/cxx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #     } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #         set bazel_build_opts "${bazel_build_opts} --action_env CC=${configure.cc} --action_env CXX=${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #     }
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # }
</span>     if {![variant_isset native]} {
         set base_march [bazel::get_base_arch]
         set bazel_build_opts "${bazel_build_opts} --copt=${base_march}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -319,11 +324,11 @@ proc bazel::get_build_opts {} {
</span> 
 proc bazel::get_build_env { } {
     set bazel_build_env ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    #if { [bazel::use_mp_clang] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    #    set bazel_build_env "BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 ${bazel_build_env}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    #} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    #    #set bazel_build_env "SDKROOT=${configure.sdkroot} ${bazel_build_env}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    #}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # if { [bazel::use_mp_clang] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #     set bazel_build_env "BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 ${bazel_build_env}"
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # }
</span>     if {![variant_isset native]} {
         set base_march [bazel::get_base_arch]
         set bazel_build_env "CC_OPT_FLAGS=${base_march} ${bazel_build_env}"
</pre><pre style='margin:0'>

</pre>