diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 19:40:00 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 19:40:00 +0000 |
commit | eb34747df37c71abad0884b073a5c2662132b2da (patch) | |
tree | 89bf36e080949643b8b686c0e70d544006d1277e | |
parent | cc96fa6149165b0bc68d737627f9ecc40236cdb8 (diff) |
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/trunk@268051 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | makeopts.in | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -81,6 +81,7 @@ export CXX export AR export RANLIB export HOST_CC +export BUILD_CC export INSTALL export STRIP export DOWNLOAD @@ -899,7 +900,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 diff --git a/makeopts.in b/makeopts.in index 841af16d0..dba6d1135 100644 --- a/makeopts.in +++ b/makeopts.in @@ -4,6 +4,7 @@ CC=@PTHREAD_CC@ HOST_CC=cc +BUILD_CC=cc CXX=@CXX@ INSTALL=@INSTALL@ |