diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-01 22:49:56 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-01 22:49:56 +0000 |
| commit | 82deb6513d876837735825613dc109b49705bdfc (patch) | |
| tree | be0680799891b8b5539f1904cd3d02904d10de4a /Makefile | |
| parent | c6cb4490f163fa97b637a5220a739b92243ba25a (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@49100 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 ..." |