anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not add -std=c++11 to CPPFLAGS (because objc does not like it)

Browse Source 
Since at least gcc 4.6 requires it, -std=c++11 has been passed to CPPFLAGS at 39717adfd. This was deemed necessary so that tests that use the preprocessor directly (AC_CHECK_HEADER) can have the right information.

It turns out that CPPFLAGS gets passed to objc compilation too (on Mac OS X) and this create compile-time errors.

Therefore we remove the -std flag from CPPFLAGS and re-add it to a separate variable cxx11_flags that is passed to LYX_CXX_USE_REGEX.
This commit is contained in:
Jean-Marc Lasgouttes 2016-02-16 15:31:08 +01:00
parent 5e38454a63
commit 3c2d3caf27
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config/lyxinclude.m4
View File

@ -168,13 +168,19 @@ AC_DEFUN([LYX_CXX_CXX11],
lyx_use_cxx11=$lyx_cv_cxx_cxx11 lyx_use_cxx11=$lyx_cv_cxx_cxx11
]) ])
dnl Usage: LYX_CXX_USE_REGEX(cxx11_flags)
dnl decide whether we want to use std::regex and set the dnl decide whether we want to use std::regex and set the
dnl LYX_USE_STD_REGEX accordingly. dnl LYX_USE_STD_REGEX accordingly.
dnl the extra cxx11 flags have to be passed to the preprocessor. They are
dnl not plainly added to AM_CPPFLAGS because then the objc compiler (mac)
dnl would fail.
AC_DEFUN([LYX_CXX_USE_REGEX], AC_DEFUN([LYX_CXX_USE_REGEX],
[lyx_std_regex=no [lyx_std_regex=no
if test $lyx_use_cxx11 = yes; then if test $lyx_use_cxx11 = yes; then
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" # we want to pass -std=c++11 to clang/cpp if necessary
CPPFLAGS="$AM_CPPFLAGS $1 $CPPFLAGS"
save_CXXFLAGS=$CXXFLAGS save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
@ -362,17 +368,20 @@ if test x$GXX = xyes; then
4.3*|4.4*|4.5*|4.6*) 4.3*|4.4*|4.5*|4.6*)
dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__. dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__.
dnl The source code relies on that. dnl The source code relies on that.
AM_CPPFLAGS="$AM_CPPFLAGS -std=c++0x";; cxx11_flags="-std=c++0x";;
clang) clang)
dnl presumably all clang versions support c++11. dnl presumably all clang versions support c++11.
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_CPPFLAGS="$AM_CPPFLAGS -std=c++11" cxx11_flags="-std=c++11"
AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";; AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";;
*) *)
AS_CASE([$host], [*cygwin*], AS_CASE([$host], [*cygwin*],
[AM_CPPFLAGS="$AM_CPPFLAGS -std=gnu++11"], [cxx11_flags="-std=gnu++11"],
[AM_CPPFLAGS="$AM_CPPFLAGS -std=c++11"]);; [cxx11_flags="-std=c++11"]);;
esac esac
# cxx11_flags is useful when running preprocessor alone
# (see detection of regex).
AM_CXXFLAGS="$cxx11_flags $AM_CXXFLAGS"
fi fi
fi fi
@ -383,7 +392,7 @@ if test $lyx_use_cxx11 = yes; then
AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-declarations" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-declarations"
fi fi
fi fi
LYX_CXX_USE_REGEX LYX_CXX_USE_REGEX([$cxx11_flags])
]) ])
dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should