<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/2e831c9c338fa6602a31b5f51b6bd890c156d63c">https://github.com/macports/macports-ports/commit/2e831c9c338fa6602a31b5f51b6bd890c156d63c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2e831c9c338fa6602a31b5f51b6bd890c156d63c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Apr 5 22:39:07 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    bazel PG: Remove default addition of a mkl variant
</span>---
 _resources/port1.0/group/bazel-1.0.tcl | 11 ++---------
 1 file changed, 2 insertions(+), 9 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 3e9390619d9..b5626b9f5bb 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;'>@@ -100,12 +100,6 @@ proc bazel::set_dep { } {
</span> }
 port::register_callback bazel::set_dep
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mkl description {Enable Intel Math Kernel Library support} { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Enable MKL by default on 10.12 and newer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if {${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#    default_variants-append +mkl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant native description {Build from source for best native platform support} {
     # Prevent precompiled binaries to let compilation optimise the library for the user processor
     archive_sites
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,9 +241,6 @@ proc bazel::get_build_opts {} {
</span>         # Incorrect SDK choice                   https://trac.macports.org/ticket/62570
         # set bazel_build_opts "${bazel_build_opts} --macos_sdk_version=${configure.sdk_version}"
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[variant_isset mkl]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set bazel_build_opts "${bazel_build_opts} --config=mkl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</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;'>@@ -278,6 +269,8 @@ proc bazel::configure_build {} {
</span>         if {![variant_isset native]} {
             set base_march [bazel::get_base_arch]
             set bazel_build_env "CC_OPT_FLAGS=${base_march} ${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 "CC_OPT_FLAGS=-march=native ${bazel_build_env}"
</span>         }
 
         build.cmd       "${bazel_build_env} [option bazel.build_cmd] [option bazel.build_cmd_opts]"
</pre><pre style='margin:0'>

</pre>