<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/fe89e3fd10ec9565ebae724099c574522f2a474e">https://github.com/macports/macports-base/commit/fe89e3fd10ec9565ebae724099c574522f2a474e</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 fe89e3f portconfigure: Ignore errors from xcrun when searching for an SDK
</span>fe89e3f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fe89e3fd10ec9565ebae724099c574522f2a474e
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sun Mar 26 00:45:58 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> portconfigure: Ignore errors from xcrun when searching for an SDK
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
src/port1.0/portconfigure.tcl | 6 ++----
1 file changed, 2 insertions(+), 4 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 a67bff1..4334057 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;'>@@ -410,13 +410,11 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
</span> return $sdk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk [exec xcrun --sdk macosx${sdk_version} --show-sdk-path]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists $sdk]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set sdk [exec xcrun --sdk macosx${sdk_version} --show-sdk-path 2> /dev/null]}]} {
</span> return $sdk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk [exec xcrun --sdk macosx --show-sdk-path]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists $sdk]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set sdk [exec xcrun --sdk macosx --show-sdk-path 2> /dev/null]}]} {
</span> ui_warn "Unable to determine location of the macOS ${sdk_version} SDK. Using the default macOS SDK."
return $sdk
}
</pre><pre style='margin:0'>
</pre>