<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/bde75c3f6ad4b70bbf62d69922322c1a6a6ae5b1">https://github.com/macports/macports-base/commit/bde75c3f6ad4b70bbf62d69922322c1a6a6ae5b1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bde75c3f6ad4b70bbf62d69922322c1a6a6ae5b1
</span>Author: Satryaji Aulia <satraul@macports.org>
AuthorDate: Wed Jun 26 11:08:02 2019 +0700
<span style='display:block; white-space:pre;color:#404040;'> Improve configure_get_developer_dir
</span>---
src/port1.0/portconfigure.tcl | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d6f982..976e63f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -515,17 +515,16 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
</span>
# internal function to determine DEVELOPER_DIR according to Xcode dependency
proc portconfigure::configure_get_developer_dir {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global use_xcode macosx_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $macosx_version 10.9] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cltpath "/Library/Developer/CommandLineTools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global use_xcode developer_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cltpath "/Library/Developer/CommandLineTools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Assume that the existence of libxcselect indiciates the earliest version of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS that places CLT in /Library/Developer/CommandLineTools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If port is Xcode-dependent or CommandLineTools directory is invalid, set to developer_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool use_xcode] || ![file exists /usr/lib/libxcselect.dylib] || ![file executable [file join $cltpath usr bin make]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${developer_dir}
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cltpath "/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${cltpath}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # if use_xcode or CLT not installed, do not set DEVELOPER_DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool use_xcode] || (![file isdirectory [file join $cltpath usr include]] || ![file executable [file join $cltpath usr bin make]])} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${cltpath}
</span> }
# internal function to determine the "-arch xy" flags for the compiler
</pre><pre style='margin:0'>
</pre>