diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-09-14 15:35:26 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-09-15 11:42:31 +0200 |
| commit | 9d2ce7ef8ea225369ec9a2e6a9b6b7a031f1a708 (patch) | |
| tree | 6bc35e9e03eaf13a2425bd07a96c3a287e674bbd /configure.ac | |
| parent | cca02a2fbdbcc6f178c05543b0315fe8e1ade812 (diff) | |
disable Clang's -fmodules-codegen for Skia if optimizing it
Skia is explicitly made to build optimized even in debug builds,
unless --enable-skia=debug is given, so $(PCH_MODULES_CODEGEN)
gets set even for it by com_GCC_class.mk , although normally
it's disabled for optimized builds as not worth it. Explicitly
disable the flag for Skia.
Change-Id: Icf030f0bdc99dbc476af585937c864f951d2b7ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102674
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 8b3097fb4c2e..5acf53a3601c 100644 --- a/configure.ac +++ b/configure.ac @@ -5507,11 +5507,16 @@ fi AC_SUBST(BUILDING_PCH_WITH_OBJ) PCH_MODULES_CODEGEN= +PCH_NO_MODULES_CODEGEN= if test -n "$BUILDING_PCH_WITH_OBJ"; then AC_MSG_CHECKING([whether $CC supports -Xclang -fmodules-codegen]) save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Werror -Xclang -fmodules-codegen" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ PCH_MODULES_CODEGEN="-Xclang -fmodules-codegen" ],[]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])], + [ + PCH_MODULES_CODEGEN="-Xclang -fmodules-codegen" + PCH_NO_MODULES_CODEGEN="-Xclang -fno-modules-codegen" + ],[]) CFLAGS=$save_CFLAGS if test -n "$PCH_MODULES_CODEGEN"; then AC_MSG_RESULT(yes) @@ -5521,6 +5526,7 @@ if test -n "$BUILDING_PCH_WITH_OBJ"; then CFLAGS=$save_CFLAGS fi AC_SUBST(PCH_MODULES_CODEGEN) +AC_SUBST(PCH_NO_MODULES_CODEGEN) PCH_MODULES_DEBUGINFO= if test -n "$BUILDING_PCH_WITH_OBJ"; then AC_MSG_CHECKING([whether $CC supports -Xclang -fmodules-debuginfo]) |