odk/settings/platform.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 35eb0d56ff37b2c1dbfb81a87a9992cf9944c92f
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Aug 20 13:15:03 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Fri Dec 6 14:43:43 2019 +0100
Fix EXTENSION_PLATFORM for Windows x86_64
Change-Id: I7fbe1963aff666205dbc9405e94d6093fb9a5a48
Reviewed-on: https://gerrit.libreoffice.org/77804
Reviewed-by: Vasily Melenchuk <vasily.melenc...@cib.de>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit af7ce81494df6c1f23af1ee14adf4aa55132b5bb)
diff --git a/odk/settings/platform.mk b/odk/settings/platform.mk
index 7e3b86c62a2c..6980a72715d0 100644
--- a/odk/settings/platform.mk
+++ b/odk/settings/platform.mk
@@ -54,7 +54,11 @@ else
EXTENSION_PLATFORM=solaris_x86
else
ifeq "$(UNOPKG_PLATFORM)" "Windows"
- EXTENSION_PLATFORM=windows_x86
+ ifeq "$(PROCTYPE)" "x86_64"
+ EXTENSION_PLATFORM=windows_x86_64
+ else
+ EXTENSION_PLATFORM=windows_x86
+ endif
endif
endif
endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
