diff options
Diffstat (limited to 'odk/settings/std.mk')
| -rw-r--r-- | odk/settings/std.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk index f43cec772cf6..32d46f8cacb5 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -56,9 +56,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 "$(PLATFORM)" "linux" JAVA_OPTIONS=-d32 endif endif +endif DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS) |