<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/76a804cc360924927fa8e2dfa41c761a19d17f3b">https://github.com/macports/macports-base/commit/76a804cc360924927fa8e2dfa41c761a19d17f3b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 76a804cc360924927fa8e2dfa41c761a19d17f3b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Sep 16 05:14:48 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> attempt to find correct compiler even without Xcode
</span>---
src/port1.0/portconfigure.tcl | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 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 e7c735a..bac6087 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;'>@@ -784,6 +784,30 @@ proc portconfigure::get_apple_compilers_xcode_version {} {
</span> }
return $compilers
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# utility procedure: get compilers created by Apple based on OS version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portconfigure::get_apple_compilers_os_version {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 5.0.1 <= Xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_compilers {clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.major} >= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 4.4 <= Xcode <= 5.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_compilers {clang llvm-gcc-4.2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.major} >= 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 4.1 <= Xcode <= 4.6.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_compilers {clang llvm-gcc-4.2 gcc-4.2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Command Line Tools is only available for Mac OS X 10.7 Lion and above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cc ${test_compilers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file executable [find_developer_tool $cc]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers $cc
</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;'>+ return $compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> # utility procedure: get Clang compilers based on os.major
proc portconfigure::get_clang_compilers {} {
global os.major porturl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -869,10 +893,10 @@ proc portconfigure::get_compiler_fallback {} {
</span>
# Check for platforms without Xcode
if {$xcodeversion eq "none" || $xcodeversion eq ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return {cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set available_apple_compilers [portconfigure::get_apple_compilers_os_version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set available_apple_compilers [portconfigure::get_apple_compilers_xcode_version]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set available_apple_compilers [portconfigure::get_apple_compilers_xcode_version]
</span> set system_compilers ""
foreach c ${available_apple_compilers} {
set v [compiler.command_line_tools_version $c]
</pre><pre style='margin:0'>
</pre>