<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/3efe7a2249641b140778a12615d108c45aa1e2e5">https://github.com/macports/macports-base/commit/3efe7a2249641b140778a12615d108c45aa1e2e5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3efe7a2249641b140778a12615d108c45aa1e2e5
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sat Mar 4 18:14:02 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> portconfigure: Use xcrun to find an appropriate SDK if manual path construction fails
</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 | 13 +++++++++++++
1 file changed, 13 insertions(+)
<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 68365d1..f663ff3 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,6 +410,19 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
</span> return $sdk
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk [exec xcrun --sdk macosx${sdk_version} --show-sdk-path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists $sdk]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk [exec xcrun --sdk macosx --show-sdk-path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists $sdk]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Unable to determine location of the macOS ${sdk_version} SDK. Using the default macOS SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Unable to determine location of a macOS SDK. Compilation will likely fail."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> return {}
}
</pre><pre style='margin:0'>
</pre>