Diff
Modified: trunk/base/doc/macports.conf.5 (91510 => 91511)
--- trunk/base/doc/macports.conf.5 2012-04-03 21:59:59 UTC (rev 91510)
+++ trunk/base/doc/macports.conf.5 2012-04-03 22:47:18 UTC (rev 91511)
@@ -234,6 +234,13 @@
.br
.Ic Default:
rebuild
+.It Va default_compiler
+Default value for configure.compiler. This can be a space-separated list. Later
+entries will be used if earlier entries are unavailable or blacklisted by a
+port. Setting this is unsupported.
+.br
+.Ic Default:
+none (internal list based on Xcode version is normally used)
.El
.Sh FILES
.Bl -tag -width
Modified: trunk/base/src/macports1.0/macports.tcl (91510 => 91511)
--- trunk/base/src/macports1.0/macports.tcl 2012-04-03 21:59:59 UTC (rev 91510)
+++ trunk/base/src/macports1.0/macports.tcl 2012-04-03 22:47:18 UTC (rev 91511)
@@ -51,7 +51,7 @@
master_site_local patch_site_local archive_site_local buildfromsource \
revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds \
host_blacklist preferred_hosts\
- packagemaker_path"
+ packagemaker_path default_compiler"
variable user_options "submitter_name submitter_email submitter_key"
variable portinterp_options "\
portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \
@@ -61,7 +61,7 @@
mp_remote_url mp_remote_submit_url configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \
applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \
os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target \
- packagemaker_path $user_options"
+ packagemaker_path default_compiler $user_options"
# deferred options are only computed when needed.
# they are not exported to the trace thread.
Modified: trunk/base/src/port1.0/portconfigure.tcl (91510 => 91511)
--- trunk/base/src/port1.0/portconfigure.tcl 2012-04-03 21:59:59 UTC (rev 91510)
+++ trunk/base/src/port1.0/portconfigure.tcl 2012-04-03 22:47:18 UTC (rev 91511)
@@ -414,8 +414,10 @@
# internal function to choose compiler fallback list based on platform
proc portconfigure::get_compiler_fallback {} {
- global xcodeversion macosx_deployment_target
- if {$xcodeversion == "none" || $xcodeversion == ""} {
+ global xcodeversion macosx_deployment_target default_compiler
+ if {[info exists default_compiler]} {
+ return $default_compiler
+ } elseif {$xcodeversion == "none" || $xcodeversion == ""} {
return {cc}
} elseif {[vercmp $xcodeversion 4.2] >= 0} {
return {clang llvm-gcc-4.2 apple-gcc-4.2}