Skip to content

C
core
Kaydet (Commit) a43dc7a1 authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile
Dosyalara gözat
Seçenekler

#i111555# - Don't force 32 bits JVM on Linux

üst a9606aa4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
odk/settings/std.mk
Dosyayı görüntüle @ a43dc7a1
...@@ -56,9 +56,11 @@ JAVA_OPTIONS= ...@@ -56,9 +56,11 @@ JAVA_OPTIONS=
ifneq "$(OO_SDK_JAVA_HOME)" "" ifneq "$(OO_SDK_JAVA_HOME)" ""
JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3) JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
ifeq "$(JAVA_BITS)" "64-Bit" ifeq "$(JAVA_BITS)" "64-Bit"
ifneq "$(PLATFORM)" "linux"
JAVA_OPTIONS=-d32 JAVA_OPTIONS=-d32
endif endif
endif endif
endif
DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS) SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment