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-08 13:43:03 +0200 |
| commit | b3810c0a92047fb08b0f44778df517cf52ecd642 (patch) | |
| tree | cc6a07c7fec40c3868b91981e9dda59dc4a00f17 | |
| parent | fc6ed79df9cae31454fd9ebd04baa690c1afaa9c (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
| -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 abcb3a3e2593..d37412e3ec62 100644 --- a/odk/build-examples_common.mk +++ b/odk/build-examples_common.mk @@ -47,7 +47,7 @@ else $(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", ))) \ $(if $(MACOSX_SHELL_HACK),&& rm -f "$$$$ODK_BUILD_SHELL")) \ >$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \ |