diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-19 09:45:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-19 17:09:27 +0100 |
| commit | 193ebf963cf251fd0885b47e59d9db11a97450f2 (patch) | |
| tree | 314c41eab4454c0e1203c814e49c3719096aba71 /configure.ac | |
| parent | 1252f32496193e8ed532de744db31413768b8efa (diff) | |
Remove obsolete Clang <= 3.1 checks
...after fa7b7f73938e837af2765f8a03f07e404046877b "Document that Clang 3.4.2 is
known to be too old"
Change-Id: Ia9fc056b58c7674c8aa0e0bf6c079ecd56d06629
Reviewed-on: https://gerrit.libreoffice.org/46771
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 75 |
1 files changed, 24 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac index cbc8f2c0a8fd..5addbb4a5319 100644 --- a/configure.ac +++ b/configure.ac @@ -3621,16 +3621,10 @@ HAVE_GCC_FINLINE_LIMIT= HAVE_GCC_FNO_INLINE= if test "$GCC" = "yes"; then AC_MSG_CHECKING([whether $CC supports -ggdb2]) - if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then - # Option just ignored and silly warning that isn't a real - # warning printed - : - else - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Werror -ggdb2" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_GGDB2=TRUE ],[]) - CFLAGS=$save_CFLAGS - fi + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Werror -ggdb2" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_GGDB2=TRUE ],[]) + CFLAGS=$save_CFLAGS if test "$HAVE_GCC_GGDB2" = "TRUE"; then AC_MSG_RESULT([yes]) else @@ -3638,15 +3632,10 @@ if test "$GCC" = "yes"; then fi AC_MSG_CHECKING([whether $CC supports -finline-limit=0]) - if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then - # As above - : - else - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Werror -finline-limit=0" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FINLINE_LIMIT=TRUE ],[]) - CFLAGS=$save_CFLAGS - fi + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Werror -finline-limit=0" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FINLINE_LIMIT=TRUE ],[]) + CFLAGS=$save_CFLAGS if test "$HAVE_GCC_FINLINE_LIMIT" = "TRUE"; then AC_MSG_RESULT([yes]) else @@ -3654,15 +3643,10 @@ if test "$GCC" = "yes"; then fi AC_MSG_CHECKING([whether $CC supports -fno-inline]) - if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then - # Ditto - : - else - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Werror -fno-inline" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FNO_INLINE=TRUE ],[]) - CFLAGS=$save_CFLAGS - fi + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Werror -fno-inline" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FNO_INLINE=TRUE ],[]) + CFLAGS=$save_CFLAGS if test "$HAVE_GCC_FNO_INLINE" = "TRUE"; then AC_MSG_RESULT([yes]) else @@ -6385,18 +6369,12 @@ HAVE_GCC_FNO_DEFAULT_INLINE= HAVE_GCC_FNO_ENFORCE_EH_SPECS= if test "$GCC" = "yes"; then AC_MSG_CHECKING([whether $CXX supports -fno-default-inline]) - if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then - # Option just ignored and silly warning that isn't a real - # warning printed - : - else - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CFLAGS -Werror -fno-default-inline" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FNO_DEFAULT_INLINE=TRUE ],[]) - CXXFLAGS=$save_CXXFLAGS - AC_LANG_POP([C++]) - fi + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CFLAGS -Werror -fno-default-inline" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FNO_DEFAULT_INLINE=TRUE ],[]) + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) if test "$HAVE_GCC_FNO_DEFAULT_INLINE" = "TRUE"; then AC_MSG_RESULT([yes]) else @@ -6404,17 +6382,12 @@ if test "$GCC" = "yes"; then fi AC_MSG_CHECKING([whether $CXX supports -fno-enforce-eh-specs]) - if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then - # As above - : - else - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CFLAGS -Werror -fno-enforce-eh-specs" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FNO_ENFORCE_EH_SPECS=TRUE ],[]) - CXXFLAGS=$save_CXXFLAGS - AC_LANG_POP([C++]) - fi + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CFLAGS -Werror -fno-enforce-eh-specs" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FNO_ENFORCE_EH_SPECS=TRUE ],[]) + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) if test "$HAVE_GCC_FNO_ENFORCE_EH_SPECS" = "TRUE"; then AC_MSG_RESULT([yes]) else |