diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-11-06 14:51:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-11-06 21:18:20 +0100 |
| commit | b21cab3f1784154cfaf7e5be71329ad6ff4f162a (patch) | |
| tree | 1423c80979bf407175bbd38e9cbec184fd11b9f0 /odk | |
| parent | c9cedde7c0ba396dadfabbf644c6329e65afebf9 (diff) | |
Make CustomTarget_odk/build-examples_java more robust against localized envs
At least on Linux, with a --with-lang=ALL build, `LANGUAGE=de make
CustomTarget_odk/build-examples_java' would fail, as it would ask for license
agreement in German rather than English (presumably because the code in
getUILangFromEnvironment, i18nlangtag/source/isolang/inunx.cxx, inspects the
LANGUAGE env var fist thing), so would expect a "ja" rather than the "yes" we
feed into stdin.
Change-Id: If285e4458e0706102a62f4e0094e5144575ccf7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158998
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'odk')
| -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 e8836f6242fb..b87958e9761c 100644 --- a/odk/build-examples_common.mk +++ b/odk/build-examples_common.mk @@ -46,7 +46,7 @@ else UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,$(1))/user) \ $(foreach my_dir,$(2), \ && (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \ - && printf 'yes\n' | LC_ALL=C make -j1 \ + && printf 'yes\n' | LANGUAGE= LC_ALL=C make -j1 \ CC="$(CXX) $(gb_CXX03FLAGS)" LINK="$(CXX)" LIB="$(CXX)" \ $(if $(MACOSX_SHELL_HACK), SHELL="$$$$ODK_BUILD_SHELL", ))) \ $(if $(MACOSX_SHELL_HACK),&& rm -f "$$$$ODK_BUILD_SHELL")) \ |