diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 19:40:42 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 19:40:42 +0000 |
| commit | c34d64a98195de6bfd064fcd28b911544fc8f3fa (patch) | |
| tree | d4478577f6c5a8bdbf652ef7055e5a636cf53d0d /Makefile | |
| parent | 25291334a96f70c63ab1ca7fa05d85a057f795aa (diff) | |
Merged revisions 268051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r268051 | tilghman | 2010-06-04 14:40:00 -0500 (Fri, 04 Jun 2010) | 13 lines
Merged revisions 268050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r268050 | tilghman | 2010-06-04 14:38:57 -0500 (Fri, 04 Jun 2010) | 6 lines
Build menuselect with the build environment's compiler, not the host (target)'s compiler.
(closes issue #17464)
Reported by: pprindeville
Tested by: tilghman
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@268052 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -80,6 +80,7 @@ export CXX export AR export RANLIB export HOST_CC +export BUILD_CC export INSTALL export STRIP export DOWNLOAD @@ -926,7 +927,7 @@ nmenuselect: menuselect/nmenuselect menuselect-tree menuselect.makeopts -@menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" # options for make in menuselect/ -MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" +MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" menuselect/menuselect: menuselect/makeopts +$(MAKE_MENUSELECT) menuselect |