summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2015-05-13 14:20:35 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-05-13 14:20:35 -0500
commita561a7781fa340511f135f586da0a5c3fc8da258 (patch)
tree0a7de7724c94f6b39fbec47b846a901cd1646e18
parent577f15ac5c043452245812085184115036b97127 (diff)
parentc624e4bae17d42c7ada07c40bd2524e7a780c7ef (diff)
Merge "General: Fix recent menuselect-related cross compile regression"
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 17a25514d..7157107b5 100644
--- a/Makefile
+++ b/Makefile
@@ -941,7 +941,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="$(CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \
+MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \
CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \
$(MAKE) -C menuselect CONFIGURE_SILENT="--silent"