summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2021-05-03 12:48:14 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2021-05-14 15:55:30 +0200
commite6e6f8c8edd7471e631a10d3ef2c280864f1f600 (patch)
tree57bfabd8db700bc068ec4ffd7fc04706752abf8a
parentb2973c9a0de24be2fe79fb1db0f0c1fc8ddb00c6 (diff)
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.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit dff559024d271a69186b608615f4a7095cbee2a4) Change-Id: I74a182435b268be8fd7a9ff0be9f404122108b51
-rw-r--r--odk/build-examples_common.mk2
1 files changed, 1 insertions, 1 deletions
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=$$$$? \