Skip to content
Permalink
Browse files

Revert "portconfigure: fix compiler selection on PPC"

This reverts commit 7cf76ec.
It did not handle universal builds correctly.
  • Loading branch information
jmroot committed Apr 10, 2018
1 parent 3647f9f commit b117967ddeaedcd1439fbe0c8fbff12a22e5a0c6
Showing with 3 additions and 11 deletions.
  1. +3 −11 src/port1.0/portconfigure.tcl
@@ -508,7 +508,7 @@ proc portconfigure::configure_get_default_compiler {} {

# internal function to choose compiler fallback list based on platform
proc portconfigure::get_compiler_fallback {} {
global xcodeversion macosx_deployment_target default_compilers configure.sdkroot configure.cxx_stdlib os.major configure.build_arch
global xcodeversion macosx_deployment_target default_compilers configure.sdkroot configure.cxx_stdlib os.major

# Check our override
if {[info exists default_compilers]} {
@@ -527,17 +527,9 @@ proc portconfigure::get_compiler_fallback {} {
return {gcc-4.0}
}
} elseif {[vercmp $xcodeversion 3.0] >= 0} {
if {${configure.build_arch} eq "ppc" || ${configure.build_arch} eq "ppc64"} {
return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-gcc-6 macports-gcc-7}
} else {
return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.4 macports-clang-3.3}
}
return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.4 macports-clang-3.3}
} else {
if {${configure.build_arch} eq "ppc" || ${configure.build_arch} eq "ppc64"} {
return {apple-gcc-4.2 gcc-4.0 macports-gcc-6 macports-gcc-7}
} else {
return {apple-gcc-4.2 gcc-4.0 macports-clang-3.3}
}
return {apple-gcc-4.2 gcc-4.0 gcc-3.3 macports-clang-3.3}
}
}

0 comments on commit b117967

Please sign in to comment.
You can’t perform that action at this time.