[102315] trunk/base/src

[jeremyhu at macports.org]

Revision: 102315
          https://trac.macports.org/changeset/102315
Author:   jeremyhu at macports.org
Date:     2013-01-30 10:18:24 -0800 (Wed, 30 Jan 2013)
Log Message:
-----------
Rename hidden 'default_compiler' option to 'default_compilers' to make it more accurate

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portconfigure.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2013-01-30 17:50:08 UTC (rev 102314)
+++ trunk/base/src/macports1.0/macports.tcl	2013-01-30 18:18:24 UTC (rev 102315)
@@ -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 default_compiler"
+        packagemaker_path default_compilers"
     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 default_compiler $user_options"
+        packagemaker_path default_compilers $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
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2013-01-30 17:50:08 UTC (rev 102314)
+++ trunk/base/src/port1.0/portconfigure.tcl	2013-01-30 18:18:24 UTC (rev 102315)
@@ -443,9 +443,9 @@
 
 # internal function to choose compiler fallback list based on platform
 proc portconfigure::get_compiler_fallback {} {
-    global xcodeversion macosx_deployment_target default_compiler
-    if {[info exists default_compiler]} {
-        return $default_compiler
+    global xcodeversion macosx_deployment_target default_compilers
+    if {[info exists default_compilers]} {
+        return $default_compilers
     } elseif {$xcodeversion == "none" || $xcodeversion == ""} {
         return {cc}
     } elseif {[vercmp $xcodeversion 4.6] >= 0} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130130/4fa4995e/attachment.html>