summaryrefslogtreecommitdiff
path: root/odk/settings/std.mk
diff options
context:
space:
mode:
Diffstat (limited to 'odk/settings/std.mk')
-rw-r--r--odk/settings/std.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 31c952178296..2227fbcb8d62 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -54,9 +54,11 @@ JAVA_OPTIONS=
ifneq "$(OO_SDK_JAVA_HOME)" ""
JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
ifeq "$(JAVA_BITS)" "64-Bit"
+ifneq "$(PROCTYPE)" "x86_64"
JAVA_OPTIONS=-d32
endif
endif
+endif
DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)