[asterisk-commits] kpfleming: branch 1.4 r49098 - /branches/1.4/Makefile

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan  1 16:08:24 2007
New Revision: 49098

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

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?view=diff&rev=49098&r1=49097&r2=49098
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Mon Jan  1 16:08:24 2007
@@ -672,7 +672,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"
+	@unset 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 ..."