You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/10/15 18:35:13 UTC

svn commit: r1398378 - /incubator/ooo/trunk/main/odk/settings/std.mk

Author: arielch
Date: Mon Oct 15 16:35:12 2012
New Revision: 1398378

URL: http://svn.apache.org/viewvc?rev=1398378&view=rev
Log:
#i111555# - Don't force 32 bits JVM on Linux

Modified:
    incubator/ooo/trunk/main/odk/settings/std.mk

Modified: incubator/ooo/trunk/main/odk/settings/std.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/odk/settings/std.mk?rev=1398378&r1=1398377&r2=1398378&view=diff
==============================================================================
--- incubator/ooo/trunk/main/odk/settings/std.mk (original)
+++ incubator/ooo/trunk/main/odk/settings/std.mk Mon Oct 15 16:35:12 2012
@@ -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)