Merged revisions 48571 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 19 Dec 2006 03:47:44 +0000 (03:47 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 19 Dec 2006 03:47:44 +0000 (03:47 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48571 | file | 2006-12-18 22:46:12 -0500 (Mon, 18 Dec 2006) | 2 lines

Use env -i to start a fresh environment when going to build menuselect. This is more portable then using unset. (issue #8543 reported by jtodd)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48572 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 9a26664..46cce10 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -678,7 +678,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
-       @unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+       @env -i && $(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 ..."