kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

BuildSystem: Allow own CFLAGS on ./configure.

Browse Source 
Before this change, make failed with the error
Unknown value '' found in build_tools/menuselect-deps for NATIVE_ARCH
when CFLAGS were supplied to the configure script. This was introduced with
<https://reviewboard.asterisk.org/r/1852/> which disabled BUILD_NATIVE when
CFLAGS were supplied. Those who need different -march= values, please, go for
./configure
make menuselect.makeopts or make menuselect
./menuselect/menuselect --disable BUILD_NATIVE

ASTERISK-25289 #close

Change-Id: Ic6365d5a97bb9b3556858f06432a8d1cfa83eebc
This commit is contained in:
Alexander Traud
2016-07-12 10:50:22 +02:00
parent 44f16af7cc
commit 110b01a0bc
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@@ -17919,19 +17919,13 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -march=native support" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -march=native support" >&5
$as_echo_n "checking for -march=native support... " >&6; } $as_echo_n "checking for -march=native support... " >&6; }
if $(${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then if $(${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
if test "${CONFIG_CFLAGS}" = ""; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
AST_NATIVE_ARCH=1 AST_NATIVE_ARCH=1
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: user CFLAGS present" >&5
$as_echo "user CFLAGS present" >&6; }
AST_NATIVE_ARCH=
fi
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
AST_NATIVE_ARCH= AST_NATIVE_ARCH=0
fi fi

11
configure.ac
View File

@@ -1217,16 +1217,11 @@ AC_SUBST(AST_SHADOW_WARNINGS)
AC_MSG_CHECKING(for -march=native support) AC_MSG_CHECKING(for -march=native support)
if $(${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then if $(${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
if test "${CONFIG_CFLAGS}" = ""; then AC_MSG_RESULT(yes)
AC_MSG_RESULT(yes) AST_NATIVE_ARCH=1
AST_NATIVE_ARCH=1
else
AC_MSG_RESULT(user CFLAGS present)
AST_NATIVE_ARCH=
fi
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AST_NATIVE_ARCH= AST_NATIVE_ARCH=0
fi fi
AC_SUBST(AST_NATIVE_ARCH) AC_SUBST(AST_NATIVE_ARCH)