odk/build-examples_common.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 2b56b53e47dee21b3f58024b262061982fbff7fb
Author: Michael Stahl <[email protected]>
AuthorDate: Tue Jan 29 14:38:06 2019 +0100
Commit: Thorsten Behrens <[email protected]>
CommitDate: Wed Jan 30 20:35:34 2019 +0100
odk: CustomTarget_build-examples hard-codes on "gcc" and "g++"
... so it fails if these aren't available; instead use the
C++ compiler of the LO build system.
Change-Id: I8a95d1865c481dc0a790d6fec6ff9fae8284d76d
Reviewed-on: https://gerrit.libreoffice.org/67078
Reviewed-by: Stephan Bergmann <[email protected]>
Tested-by: Jenkins
(cherry picked from commit b05484224df74709edf654901d1da299c168e344)
Reviewed-on: https://gerrit.libreoffice.org/67113
Reviewed-by: Thorsten Behrens <[email protected]>
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index 931d6eea856e..4d7d645ed40a 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -31,6 +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)" \
$(if $(filter MACOSX,$(OS)), SHELL=$(ODK_BUILD_SHELL), ))))
\
>$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \
|| (RET=$$$$? \
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
