configure.ac | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit e9332dcdc8f2ea268d1b17c73d43a8834cf75365
Author: Luboš Luňák <l.lu...@centrum.cz>
AuthorDate: Mon Nov 29 16:07:52 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Nov 29 22:54:01 2021 +0100
explicitly check also for -fno-pch-codegen
The catch is that clang-cl does not know it, it only understands
-Xclang -fpch-codegen. On Linux -fno-pch-codegen is handled by
the driver, but clang-cl doesn't know the options, so we pass
to the backend using -Xclang, but that one understands only
-fpch-codegen. So if not found, do not use that option, the cost
is only that compiling precompiled_skia.cxx will take longer.
Change-Id: Ie307f96b381b732517a5ab574c742a2ee0bfb687
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126067
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 65a38d685c73..140ee52e675f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6014,10 +6014,11 @@ if test -n "$BUILDING_PCH_WITH_OBJ"; then
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror ${fpch_prefix}-fpch-codegen"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],
- [
- PCH_CODEGEN="${fpch_prefix}-fpch-codegen"
- PCH_NO_CODEGEN="${fpch_prefix}-fno-pch-codegen"
- ],[])
+ [ PCH_CODEGEN="${fpch_prefix}-fpch-codegen" ],[])
+ CFLAGS=$save_CFLAGS
+ CFLAGS="$CFLAGS -Werror ${fpch_prefix}-fno-pch-codegen"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],
+ [ PCH_NO_CODEGEN="${fpch_prefix}-fno-pch-codegen" ],[])
CFLAGS=$save_CFLAGS
if test -n "$PCH_CODEGEN"; then
AC_MSG_RESULT(yes)
