summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-04-19 09:26:53 +0200
committerPetr Mladek <pmladek@suse.cz>2013-05-07 10:29:34 +0200
commit9b4ee3cc2663d95cb5d29ebc96a2226235d4dbaf (patch)
treee9a656bd0fc64db1b972024b269246071fb9dab5 /odk
parent378973375d8abf93fa09c728966c2669b082bbc6 (diff)
fdo#63693 Do not force java -d32 for a 64-bit SDK
The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there "java -version" outputs "OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode)" with "64-Bit" in the second instead of the third field), so make it a bit more cheesy still (i.e., just cover the case to not set -d32 for x86_64). Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a (cherry picked from commit 391477d40ea718c46089e16484726dba085a6ad8) Reviewed-on: https://gerrit.libreoffice.org/3480 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'odk')
-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)