<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141134] trunk/base/src/port1.0/portconfigure.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141134">141134</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-10-11 10:09:05 -0700 (Sun, 11 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor and update portconfigure::get_compiler_fallback
Separate out list generation into stages for easier updates in the future.
Use newer clang versions when using libc++ as our default C++ runtime.
Don't add legacy gcc fallbacks on El Capitan.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portconfiguretcl">trunk/base/src/port1.0/portconfigure.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portconfiguretcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portconfigure.tcl (141133 => 141134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portconfigure.tcl 2015-10-11 16:15:20 UTC (rev 141133)
+++ trunk/base/src/port1.0/portconfigure.tcl 2015-10-11 17:09:05 UTC (rev 141134)
</span><span class="lines">@@ -473,28 +473,58 @@
</span><span class="cx">
</span><span class="cx"> # internal function to choose compiler fallback list based on platform
</span><span class="cx"> proc portconfigure::get_compiler_fallback {} {
</span><del>- global xcodeversion macosx_deployment_target default_compilers configure.sdkroot
</del><ins>+ global xcodeversion macosx_deployment_target default_compilers configure.sdkroot configure.cxx_stdlib os.major
+
+ # Check our override
</ins><span class="cx"> if {[info exists default_compilers]} {
</span><span class="cx"> return $default_compilers
</span><del>- } elseif {$xcodeversion eq "none" || $xcodeversion eq ""} {
</del><ins>+ }
+
+ # Check for platforms without Xcode
+ if {$xcodeversion eq "none" || $xcodeversion eq ""} {
</ins><span class="cx"> return {cc}
</span><del>- } elseif {[vercmp $xcodeversion 5.0] >= 0} {
- return {clang macports-clang-3.4 macports-clang-3.3 macports-llvm-gcc-4.2 apple-gcc-4.2}
</del><ins>+ }
+
+ # Legacy cases
+ if {[vercmp $xcodeversion 4.0] < 0} {
+ if {[vercmp $xcodeversion 3.2] >= 0} {
+ if {[string match *10.4u* ${configure.sdkroot}]} {
+ return {gcc-4.0}
+ }
+ } elseif {[vercmp $xcodeversion 3.0] >= 0} {
+ return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.4 macports-clang-3.3}
+ } else {
+ return {apple-gcc-4.2 gcc-4.0 gcc-3.3 macports-clang-3.3}
+ }
+ }
+
+ set compilers {}
+
+ # Set our preferred Xcode-provided compilers
+ if {[vercmp $xcodeversion 5.0] >= 0} {
+ lappend compilers clang
</ins><span class="cx"> } elseif {[vercmp $xcodeversion 4.3] >= 0} {
</span><del>- return {clang llvm-gcc-4.2 macports-clang-3.4 macports-clang-3.3 apple-gcc-4.2}
</del><ins>+ lappend compilers clang llvm-gcc-4.2
</ins><span class="cx"> } elseif {[vercmp $xcodeversion 4.0] >= 0} {
</span><del>- return {llvm-gcc-4.2 clang gcc-4.2 macports-clang-3.4 macports-clang-3.3 apple-gcc-4.2}
- } elseif {[vercmp $xcodeversion 3.2] >= 0} {
- if {[string match *10.4u* ${configure.sdkroot}]} {
- return {gcc-4.0}
- } else {
- return {gcc-4.2 clang llvm-gcc-4.2 macports-clang-3.4 macports-clang-3.3 macports-llvm-gcc-4.2 apple-gcc-4.2 gcc-4.0}
- }
- } elseif {[vercmp $xcodeversion 3.0] >= 0} {
- return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.4 macports-clang-3.3}
</del><ins>+ lappend compilers llvm-gcc-4.2 clang
</ins><span class="cx"> } else {
</span><del>- return {apple-gcc-4.2 gcc-4.0 gcc-3.3 macports-clang-3.3}
</del><ins>+ lappend compilers gcc-4.2 clang llvm-gcc-4.2
</ins><span class="cx"> }
</span><ins>+
+ # Determine which versions of clang we prefer
+ if {${configure.cxx_stdlib} eq "libc++"} { # clang-3.5+ require libc++
+ lappend compilers macports-clang-3.7 macports-clang-3.6 macports-clang-3.5 macports-clang-3.4
+ } else {
+ lappend compilers macports-clang-3.4 macports-clang-3.3
+ }
+
+ # Determine if we have MacPorts-provided legacy gcc fallbacks
+ if {${os.major} < 15} {
+ lappend compilers macports-llvm-gcc-4.2 apple-gcc-4.2
+ }
+
+ ui_debug "Preferred compilers: $compilers"
+ return $compilers
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Find a developer tool
</span></span></pre>
</div>
</div>
</body>
</html>