diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-07-13 06:42:57 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-07-13 06:42:57 -0500 |
| commit | c48016e2f2318ecb67a68c91def8f3f8f6a7b4cf (patch) | |
| tree | 0f8352aa6e9174df7197b6840d63177d234f96a7 | |
| parent | c2a72e6aa6515730acb30ad0a5392c97588d8935 (diff) | |
| parent | 110b01a0bc59b3cf6570cfabec7684627371fb2b (diff) | |
Merge "BuildSystem: Allow own CFLAGS on ./configure."
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 6 insertions, 17 deletions
@@ -17930,19 +17930,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -march=native support" >&5 $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 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; } - 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 + AST_NATIVE_ARCH=1 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - AST_NATIVE_ARCH= + AST_NATIVE_ARCH=0 fi diff --git a/configure.ac b/configure.ac index 6256ef7fb..3cb0fed05 100644 --- a/configure.ac +++ b/configure.ac @@ -1217,16 +1217,11 @@ AC_SUBST(AST_SHADOW_WARNINGS) AC_MSG_CHECKING(for -march=native support) 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) - AST_NATIVE_ARCH=1 - else - AC_MSG_RESULT(user CFLAGS present) - AST_NATIVE_ARCH= - fi + AC_MSG_RESULT(yes) + AST_NATIVE_ARCH=1 else AC_MSG_RESULT(no) - AST_NATIVE_ARCH= + AST_NATIVE_ARCH=0 fi AC_SUBST(AST_NATIVE_ARCH) |