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

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

diff --git a/Makefile b/Makefile
index 832f879643578a5ad2886a89ac0a450f5cb05c7b..20d522406ac9e09c1edd1acedaa1d4ef64ef57cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,7 @@ export CXX
 export AR
 export RANLIB
 export HOST_CC
+export BUILD_CC
 export INSTALL
 export STRIP
 export DOWNLOAD
@@ -926,7 +927,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 1be2f05e071f33c78e75f1be2654710f30f4bde5..85c54d776d9bab86a99c623da64afac3b402fe80 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@