summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-08-20 13:15:03 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-12-06 14:43:43 +0100
commit35eb0d56ff37b2c1dbfb81a87a9992cf9944c92f (patch)
treeff1cd8982850dde4487984f369ac644316bd8e79
parentcbe41ccc81013424a9761a86003debabbabb6eb1 (diff)
Fix EXTENSION_PLATFORM for Windows x86_64
Change-Id: I7fbe1963aff666205dbc9405e94d6093fb9a5a48 Reviewed-on: https://gerrit.libreoffice.org/77804 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit af7ce81494df6c1f23af1ee14adf4aa55132b5bb)
-rw-r--r--odk/settings/platform.mk6
1 files changed, 5 insertions, 1 deletions
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