summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2010-06-04 19:40:00 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2010-06-04 19:40:00 +0000
commita0baefec79e3009f23ae8d8746f913fc37d35f72 (patch)
tree89bf36e080949643b8b686c0e70d544006d1277e /Makefile
parent24b74559797d2074f10a55d64ea8e107bf2894f4 (diff)
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 933ffe20f..20b5ecf17 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