From e6e6f8c8edd7471e631a10d3ef2c280864f1f600 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 3 May 2021 12:48:14 +0200 Subject: 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 Reviewed-by: Thorsten Behrens (cherry picked from commit dff559024d271a69186b608615f4a7095cbee2a4) Change-Id: I74a182435b268be8fd7a9ff0be9f404122108b51 --- odk/build-examples_common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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=$$$$? \ -- cgit