<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/de4ee64bb7b3c796396e349fb6ce207dbdc0658a">https://github.com/macports/macports-ports/commit/de4ee64bb7b3c796396e349fb6ce207dbdc0658a</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 de4ee64bb7b bazel PG: Clean up how -march is set
</span>de4ee64bb7b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit de4ee64bb7b3c796396e349fb6ce207dbdc0658a
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun May 16 17:16:44 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> bazel PG: Clean up how -march is set
</span>---
_resources/port1.0/group/bazel-1.0.tcl | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 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 69d28658890..97d6125fa36 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;'>@@ -142,10 +142,14 @@ variant native description {Build from source for best native platform support}
</span>
proc bazel::get_base_arch {} {
global configure.build_arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "x86_64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "-march=x86-64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "-march=armv8-a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset native] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "-march=native"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.build_arch} eq "x86_64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "-march=x86-64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "-march=armv8-a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
return ""
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -322,12 +326,7 @@ 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 {![variant_isset native]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set base_march [bazel::get_base_arch]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set bazel_build_opts "${bazel_build_opts} --copt=${base_march}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set bazel_build_opts "${bazel_build_opts} --copt=-march=native"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bazel_build_opts "${bazel_build_opts} --copt=[bazel::get_base_arch]"
</span> if { [option configure.ccache] } {
set bazel_build_opts "${bazel_build_opts} --action_env CCACHE_DIR=[compwrap::get_ccache_dir]"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,14 +335,7 @@ proc bazel::get_build_opts {} {
</span> }
proc bazel::get_build_env { } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set bazel_build_env ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset native]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set base_march [bazel::get_base_arch]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set bazel_build_env "CC_OPT_FLAGS=${base_march} ${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 "CC_OPT_FLAGS=-march=native ${bazel_build_env}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set bazel_build_env "BAZEL_SH=/bin/bash ${bazel_build_env}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bazel_build_env "BAZEL_SH=/bin/bash CC_OPT_FLAGS=[bazel::get_base_arch]"
</span> if { [option configure.ccache] } {
set bazel_build_env "CCACHE_DIR=[compwrap::get_ccache_dir] ${bazel_build_env}"
}
</pre><pre style='margin:0'>
</pre>