From: Tilghman Lesher Date: Fri, 4 Jun 2010 19:40:42 +0000 (+0000) Subject: Merged revisions 268051 via svnmerge from X-Git-Tag: 1.6.2.10-rc1~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2832d5abed8d7505006b0bea67dc6d334647f8b3;p=thirdparty%2Fasterisk.git 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 832f879643..20d522406a 100644 --- 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 1be2f05e07..85c54d776d 100644 --- a/makeopts.in +++ b/makeopts.in @@ -4,6 +4,7 @@ CC=@PTHREAD_CC@ HOST_CC=cc +BUILD_CC=cc CXX=@CXX@ INSTALL=@INSTALL@