mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
More tweaks to C++ compiler detection
Now CXXFLAGS is left alone by autoconf: only the user can override it. Properly set -g and -O options, which were overriden. Try to put the arguments in a more reasonable ordering.
This commit is contained in:
parent
3fca2b557b
commit
33ff0f276a
@ -162,6 +162,7 @@ AC_DEFUN([LYX_LIB_STDCXX],
|
|||||||
AC_DEFUN([LYX_PROG_CXX],
|
AC_DEFUN([LYX_PROG_CXX],
|
||||||
[AC_REQUIRE([AC_PROG_CXX])
|
[AC_REQUIRE([AC_PROG_CXX])
|
||||||
AC_REQUIRE([AC_PROG_CXXCPP])
|
AC_REQUIRE([AC_PROG_CXXCPP])
|
||||||
|
|
||||||
AC_LANG_PUSH(C++)
|
AC_LANG_PUSH(C++)
|
||||||
LYX_PROG_CLANG
|
LYX_PROG_CLANG
|
||||||
LYX_LIB_STDCXX
|
LYX_LIB_STDCXX
|
||||||
@ -260,8 +261,8 @@ if test x$GXX = xyes; then
|
|||||||
AM_CXXFLAGS="-g $AM_CXXFLAGS"
|
AM_CXXFLAGS="-g $AM_CXXFLAGS"
|
||||||
fi
|
fi
|
||||||
if test $build_type = gprof ; then
|
if test $build_type = gprof ; then
|
||||||
AM_CXXFLAGS="-pg $AM_CXXFLAGS"
|
AM_CXXFLAGS="$AM_CXXFLAGS -pg"
|
||||||
AM_LDFLAGS="-pg $AM_LDFLAGS"
|
AM_LDFLAGS="$AM_LDFLAGS -pg"
|
||||||
fi
|
fi
|
||||||
if test $build_type = profiling ; then
|
if test $build_type = profiling ; then
|
||||||
AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
|
AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
|
||||||
@ -274,23 +275,20 @@ if test x$GXX = xyes; then
|
|||||||
if test x$enable_warnings = xyes ; then
|
if test x$enable_warnings = xyes ; then
|
||||||
case $gxx_version in
|
case $gxx_version in
|
||||||
3.1*|3.2*|3.3*)
|
3.1*|3.2*|3.3*)
|
||||||
AM_CPPFLAGS="-W -Wall $AM_CPPFLAGS"
|
AM_CPPFLAGS="$AM_CPPFLAGS -Wall -W"
|
||||||
;;
|
;;
|
||||||
3.4*|4.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*|clang)
|
3.4*|4.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*|clang)
|
||||||
AM_CPPFLAGS="-Wextra -Wall $AM_CPPFLAGS"
|
AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AM_CPPFLAGS="-Wextra -Wall -Wfloat-conversion $AM_CPPFLAGS"
|
AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra -Wfloat-conversion"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
case $gxx_version in
|
case $gxx_version in
|
||||||
3.1*) AM_CXXFLAGS="-finline-limit=500 ";;
|
3.1*) AM_CXXFLAGS="$AM_CXXFLAGS -finline-limit=500";;
|
||||||
3.2*|3.3*) AM_CXXFLAGS="";;
|
3.2*|3.3*) ;;
|
||||||
3.4*|4.*)
|
*) test $enable_pch = yes && lyx_pch_comp=yes ;;
|
||||||
AM_CXXFLAGS=""
|
|
||||||
test $enable_pch = yes && lyx_pch_comp=yes
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
if test x$enable_stdlib_debug = xyes ; then
|
if test x$enable_stdlib_debug = xyes ; then
|
||||||
dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
|
dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
|
||||||
@ -322,15 +320,15 @@ if test x$GXX = xyes; then
|
|||||||
3.*|4.0*|4.1*|4.2*) AC_ERROR([There is no C++11 support in gcc 3.x]);;
|
3.*|4.0*|4.1*|4.2*) AC_ERROR([There is no C++11 support in gcc 3.x]);;
|
||||||
4.3*|4.4*|4.5*|4.6*)
|
4.3*|4.4*|4.5*|4.6*)
|
||||||
lyx_flags="$lyx_flags c++11-mode"
|
lyx_flags="$lyx_flags c++11-mode"
|
||||||
AM_CXXFLAGS="-std=gnu++0x $AM_CXXFLAGS";;
|
AM_CXXFLAGS="$AM_CXXFLAGS -std=gnu++0x";;
|
||||||
clang)
|
clang)
|
||||||
dnl presumably all clang version support c++11.
|
dnl presumably all clang version support c++11.
|
||||||
lyx_flags="$lyx_flags c++11-mode"
|
lyx_flags="$lyx_flags c++11-mode"
|
||||||
dnl the deprecated-register warning is very annoying with Qt4.x right now.
|
dnl the deprecated-register warning is very annoying with Qt4.x right now.
|
||||||
AM_CXXFLAGS="-std=c++11 -Wno-deprecated-register $AM_CXXFLAGS";;
|
AM_CXXFLAGS="$AM_CXXFLAGS -std=c++11 -Wno-deprecated-register";;
|
||||||
*)
|
*)
|
||||||
lyx_flags="$lyx_flags c++11-mode"
|
lyx_flags="$lyx_flags c++11-mode"
|
||||||
AM_CXXFLAGS="-std=gnu++11 $AM_CXXFLAGS"
|
AM_CXXFLAGS="$AM_CXXFLAGS -std=gnu++11"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then
|
if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then
|
||||||
|
10
configure.ac
10
configure.ac
@ -67,7 +67,17 @@ AM_PATH_PYTHON(2.4.0,, :)
|
|||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
|
|
||||||
### Check for a C++ compiler
|
### Check for a C++ compiler
|
||||||
|
dnl We have to do weird tricks so that autoconf does not touch CXXFLAGS even
|
||||||
|
dnl if it is not set. We do not use autoconf defaults.
|
||||||
|
lyx_has_CXXFLAGS=${CXXFLAGS+yes}
|
||||||
|
if ! test "$lyx_has_CXXFLAGS" = yes; then
|
||||||
|
dnl set to a dummy value so that AC_PROG_CXX does not try to set CXXFLAGS
|
||||||
|
CXXFLAGS=" "
|
||||||
|
fi
|
||||||
LYX_PROG_CXX
|
LYX_PROG_CXX
|
||||||
|
if ! test "$lyx_has_CXXFLAGS" = yes; then
|
||||||
|
unset CXXFLAGS
|
||||||
|
fi
|
||||||
AC_LANG(C++)
|
AC_LANG(C++)
|
||||||
|
|
||||||
### Objective-C compiler
|
### Objective-C compiler
|
||||||
|
Loading…
Reference in New Issue
Block a user