From: Kevin P. Fleming Date: Mon, 1 Jan 2007 22:49:56 +0000 (+0000) Subject: Merged revisions 49098-49099 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~3583 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ebe6679a25a9bfb3c7e8e82614d85322cb06555;p=thirdparty%2Fasterisk.git Merged revisions 49098-49099 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r49098 | kpfleming | 2007-01-01 16:08:24 -0600 (Mon, 01 Jan 2007) | 2 lines revert this change until a better solution can be found... 'env -i' was not being used properly, but even when changed to do so, this process fails during cross-compilation because the menuselect build still sees 'CC' as set to the cross-compiler ........ r49099 | kpfleming | 2007-01-01 16:48:03 -0600 (Mon, 01 Jan 2007) | 2 lines use a simpler (and portable) method to ensure that menuselect is built as a host binary ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49100 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index b4d3ddf64d..914081271c 100644 --- a/Makefile +++ b/Makefile @@ -679,7 +679,7 @@ menuselect: menuselect/menuselect menuselect-tree -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts - @env -i && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" + @CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml @echo "Generating input for menuselect ..."