<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/b117967ddeaedcd1439fbe0c8fbff12a22e5a0c6">https://github.com/macports/macports-base/commit/b117967ddeaedcd1439fbe0c8fbff12a22e5a0c6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b117967ddeaedcd1439fbe0c8fbff12a22e5a0c6
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Apr 10 08:59:37 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> Revert "portconfigure: fix compiler selection on PPC"
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commit 7cf76ecd34ea1d78f918f2f026003161cc439a4e.
</span><span style='display:block; white-space:pre;color:#404040;'> It did not handle universal builds correctly.
</span>---
src/port1.0/portconfigure.tcl | 14 +++-----------
1 file changed, 3 insertions(+), 11 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 15f728b..f5ad4ac 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;'>@@ -508,7 +508,7 @@ proc portconfigure::configure_get_default_compiler {} {
</span>
# internal function to choose compiler fallback list based on platform
proc portconfigure::get_compiler_fallback {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global xcodeversion macosx_deployment_target default_compilers configure.sdkroot configure.cxx_stdlib os.major configure.build_arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global xcodeversion macosx_deployment_target default_compilers configure.sdkroot configure.cxx_stdlib os.major
</span>
# Check our override
if {[info exists default_compilers]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -527,17 +527,9 @@ proc portconfigure::get_compiler_fallback {} {
</span> return {gcc-4.0}
}
} elseif {[vercmp $xcodeversion 3.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "ppc" || ${configure.build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-gcc-6 macports-gcc-7}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.4 macports-clang-3.3}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.4 macports-clang-3.3}
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "ppc" || ${configure.build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return {apple-gcc-4.2 gcc-4.0 macports-gcc-6 macports-gcc-7}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return {apple-gcc-4.2 gcc-4.0 macports-clang-3.3}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {apple-gcc-4.2 gcc-4.0 gcc-3.3 macports-clang-3.3}
</span> }
}
</pre><pre style='margin:0'>
</pre>