[asterisk-commits] tilghman: branch 1.6.2 r268052 - in /branches/1.6.2: ./ Makefile makeopts.in

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jun  4 14:40:42 2010
New Revision: 268052

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=268052
Log:
Merged revisions 268051 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r268051 | tilghman | 2010-06-04 14:40:00 -0500 (Fri, 04 Jun 2010) | 13 lines
  
  Merged revisions 268050 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r268050 | tilghman | 2010-06-04 14:38:57 -0500 (Fri, 04 Jun 2010) | 6 lines
    
    Build menuselect with the build environment's compiler, not the host (target)'s compiler.
    
    (closes issue #17464)
     Reported by: pprindeville
     Tested by: tilghman
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/Makefile
    branches/1.6.2/makeopts.in

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/Makefile?view=diff&rev=268052&r1=268051&r2=268052
==============================================================================
--- branches/1.6.2/Makefile (original)
+++ branches/1.6.2/Makefile Fri Jun  4 14:40:42 2010
@@ -80,6 +80,7 @@
 export AR
 export RANLIB
 export HOST_CC
+export BUILD_CC
 export INSTALL
 export STRIP
 export DOWNLOAD
@@ -926,7 +927,7 @@
 	- at menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
 
 # options for make in menuselect/
-MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
 
 menuselect/menuselect: menuselect/makeopts
 	+$(MAKE_MENUSELECT) menuselect

Modified: branches/1.6.2/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/makeopts.in?view=diff&rev=268052&r1=268051&r2=268052
==============================================================================
--- branches/1.6.2/makeopts.in (original)
+++ branches/1.6.2/makeopts.in Fri Jun  4 14:40:42 2010
@@ -4,6 +4,7 @@
 
 CC=@PTHREAD_CC@
 HOST_CC=cc
+BUILD_CC=cc
 CXX=@CXX@
 
 INSTALL=@INSTALL@