odk/build-examples_common.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8a2fa36eb2c0a69884d4a3188ec542b89861e57d
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon May 3 12:48:14 2021 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Jun 1 11:15:19 2021 +0200
odk: build examples with GCC with explicit -std=c++11
GCC 11 defaults to -std=c++17, which doesn't support exception
specifications any more.
ddcc98fa50dd9d86a60dada4daa00f4d95ffe005 seems a bit large to backport.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115505
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
(cherry picked from commit dff559024d271a69186b608615f4a7095cbee2a4)
Change-Id: I74a182435b268be8fd7a9ff0be9f404122108b51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115978
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index 4d7d645ed40a..9f5231c42765 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -31,7 +31,7 @@ endif
$(foreach my_dir,$(2), \
&& (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
&& printf 'yes\n' | LC_ALL=C make \
- CC="$(CXX)" LINK="$(CXX)" LIB="$(CXX)" \
+ CC="$(CXX) $(if $(filter GCC,$(COM)),-std=c++11)"
LINK="$(CXX)" LIB="$(CXX)" \
$(if $(filter MACOSX,$(OS)), SHELL=$(ODK_BUILD_SHELL), ))))
\
>$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \
|| (RET=$$$$? \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
