diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-05-03 12:48:14 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-07-02 13:34:47 +0200 |
| commit | e263fa9fce48ff6563edcccd001d00b99db6393c (patch) | |
| tree | 4a42932f10223e8fc5602a9b1bc4a85c3cd32d49 | |
| parent | e96fd348f65f6ac3333ff51ebe3ae52e1c5111fe (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.
Change-Id: I74a182435b268be8fd7a9ff0be9f404122108b51
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>
| -rw-r--r-- | odk/build-examples_common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk index 50ea40ec905e..f05220f3f635 100644 --- a/odk/build-examples_common.mk +++ b/odk/build-examples_common.mk @@ -48,7 +48,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 $(MACOSX_SHELL_HACK), SHELL=$(ODK_BUILD_SHELL), )))) \ >$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \ || (RET=$$$$? \ |