From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 4 Jun 2010 19:40:00 +0000 (+0000)
Subject: Merged revisions 268050 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2908
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0baefec79e3009f23ae8d8746f913fc37d35f72;p=thirdparty%2Fasterisk.git

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 933ffe20fd..20b5ecf174 100644
--- 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 841af16d0e..dba6d11355 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -4,6 +4,7 @@
 
 CC=@PTHREAD_CC@
 HOST_CC=cc
+BUILD_CC=cc
 CXX=@CXX@
 
 INSTALL=@INSTALL@