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: https://origsvn.digium.com/svn/asterisk/trunk@268051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
24b7455979
commit
a0baefec79
3
Makefile
3
Makefile
|
@ -81,6 +81,7 @@ export CXX
|
||||||
export AR
|
export AR
|
||||||
export RANLIB
|
export RANLIB
|
||||||
export HOST_CC
|
export HOST_CC
|
||||||
|
export BUILD_CC
|
||||||
export INSTALL
|
export INSTALL
|
||||||
export STRIP
|
export STRIP
|
||||||
export DOWNLOAD
|
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!"
|
-@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/
|
# 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
|
menuselect/menuselect: menuselect/makeopts
|
||||||
+$(MAKE_MENUSELECT) menuselect
|
+$(MAKE_MENUSELECT) menuselect
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
CC=@PTHREAD_CC@
|
CC=@PTHREAD_CC@
|
||||||
HOST_CC=cc
|
HOST_CC=cc
|
||||||
|
BUILD_CC=cc
|
||||||
CXX=@CXX@
|
CXX=@CXX@
|
||||||
|
|
||||||
INSTALL=@INSTALL@
|
INSTALL=@INSTALL@
|
||||||
|
|
Loading…
Reference in New Issue