[svn-commits] kpfleming: trunk r49100 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan  1 16:49:56 2007
New Revision: 49100

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49100
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=49100&r1=49099&r2=49100
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jan  1 16:49:56 2007
@@ -679,7 +679,7 @@
 	- at 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 ..."