diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-10-15 15:35:12 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2012-10-15 15:35:12 +0000 |
| commit | a43dc7a1b0168d6e438ec83cf4f3b226574eda0c (patch) | |
| tree | 9080d8f8d14ea75ae8a860701f9cc5c46293e39a /odk/settings | |
| parent | a9606aa4d8a6bcb3955d991ee45c56cb93be2450 (diff) | |
#i111555# - Don't force 32 bits JVM on Linux
Notes
Notes:
prefer: 391477d40ea718c46089e16484726dba085a6ad8
Diffstat (limited to 'odk/settings')
| -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) |