diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-05-13 14:20:42 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-05-13 14:20:42 -0500 |
| commit | 51478575e4456b2e260ed2130094c1cd72dc549e (patch) | |
| tree | 6cec8c42bd3b889952cbfa5bf747db82f4a05685 | |
| parent | 5fcaf727cca84770559d8d5be848bb8810100d28 (diff) | |
| parent | 6627de830b7a121939662a640e7b0aaa3899f61b (diff) | |
Merge "General: Fix recent menuselect-related cross compile regression" into 13
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -942,7 +942,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" |