summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-01-28 09:05:22 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-01-28 12:36:43 +0100
commitfcc5fc76c33de566cb2d02be541dcbde29d1eb8a (patch)
tree49a0f557db8f9972aae903a1f554f3aa7684097d /solenv
parent68bdea37d79793bc8dff4672c2d360be3554b041 (diff)
org.freedesktop.Sdk//18.08 `uname -i` always returns "unknown"
(cf. <https://github.com/flathub/org.libreoffice.LibreOffice/pull/67/commits/ deda15380b436ca8fe62e2ebc1feec8bcb6dd43e> "org.freedesktop.Sdk//18.08 `uname -i` always returns 'unknown'") Change-Id: Id158d769edb07aa09189907d120cb1e9cd8d9b17 Reviewed-on: https://gerrit.libreoffice.org/66985 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/flatpak-manifest.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index db4bfc94409d..1d3f85593b2e 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -562,7 +562,7 @@
"buildsystem": "simple",
"build-commands": [
"./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak",
- "make $(if test \"$(uname -i)\" = i386; then printf build-nocheck; fi)",
+ "make $(if test \"$FLATPAK_ARCH\" = i386; then printf build-nocheck; fi)",
"make distro-pack-install",
"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
"desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-startcenter /app/share/applications/org.libreoffice.LibreOffice.desktop",