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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@268051 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 933ffe20fdd1206a8e3d660487e5e811cb733f33..20b5ecf17429d8434d068be6dc4f75a4582eb6aa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,7 @@ export CXX
 export AR
 export RANLIB
 export HOST_CC
+export BUILD_CC
 export INSTALL
 export STRIP
 export DOWNLOAD
@@ -899,7 +900,7 @@ nmenuselect: menuselect/nmenuselect menuselect-tree menuselect.makeopts
        -@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

diff --git a/makeopts.in b/makeopts.in
index 841af16d0eafb4a2ffc24d9d5d8dc5ab5d34afc6..dba6d1135578d3e308ad340ee7156a0d5044e9a4 100644 (file)
--- a/makeopts.in
+++ b/makeopts.in
@@ -4,6 +4,7 @@
 
 CC=@PTHREAD_CC@
 HOST_CC=cc
+BUILD_CC=cc
 CXX=@CXX@
 
 INSTALL=@INSTALL@