<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a05eaec189f863713e8f8257fe551c1e336fa98">https://github.com/macports/macports-ports/commit/9a05eaec189f863713e8f8257fe551c1e336fa98</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 9a05eaec189 ld64: default to ld64_xcode with system test
</span>9a05eaec189 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a05eaec189f863713e8f8257fe551c1e336fa98
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Nov 23 23:06:32 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> ld64: default to ld64_xcode with system test
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> we previously used an xcodeversion test to see how new the
</span><span style='display:block; white-space:pre;color:#404040;'> system ld64 was, but this test fails when users have only
</span><span style='display:block; white-space:pre;color:#404040;'> installed the CLTs, which we are trying to support.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> So... we have to use a system version test instead here.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://trac.macports.org/ticket/61636#comment:20
</span>---
devel/ld64/Portfile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ld64/Portfile b/devel/ld64/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81acf06d518..9c3265bf96b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ld64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ld64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,10 +259,13 @@ if {${subport} eq ${name}} {
</span> # advanced users running darwin 10 to darwin 15 at present will have to manually upgrade to ld64_latest to get the newest ld64
# it might be possible to work around this using a bootstrap install of ld64, or a wrapper script that calls the newest ld64 installed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # darwin 16+ can build libtapi, and so defaults to ld64_latest to get the newest ld64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # darwin 16 and 17 can build libtapi but their xcode comes with an older ld64 than ld64_latest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so they default to ld64_latest to get the newest ld64
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 11 has a newer ld64 than MacPorts currently supplies, so we use it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $xcodeversion 11.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 11 has a newer ld64 than the current ld64_latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we can't use xcodeversion to test this as that returns none if only the CLTs are installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so we assume that Mojave and newer have a newer ld64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 18} {
</span> default_variants +ld64_xcode
}
</pre><pre style='margin:0'>
</pre>