[svn-commits] tilghman: trunk r268051 - in /trunk: ./ Makefile makeopts.in

Fri Jun 4 14:40:04 CDT 2010

Author: tilghman
Date: Fri Jun  4 14:40:00 2010
New Revision: 268051

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=268051
Log:
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:
    trunk/   (props changed)
    trunk/Makefile
    trunk/makeopts.in

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=268051&r1=268050&r2=268051
==============================================================================

--- trunk/Makefile (original)
+++ trunk/Makefile Fri Jun  4 14:40:00 2010
@@ -81,6 +81,7 @@
 export AR
 export RANLIB
 export HOST_CC
+export BUILD_CC
 export INSTALL
 export STRIP
 export DOWNLOAD
@@ -899,7 +900,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: trunk/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/trunk/makeopts.in?view=diff&rev=268051&r1=268050&r2=268051
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Fri Jun  4 14:40:00 2010
@@ -4,6 +4,7 @@
 
 CC=@PTHREAD_CC@
 HOST_CC=cc
+BUILD_CC=cc
 CXX=@CXX@
 
 INSTALL=@INSTALL@


