From a662d427108d781122f979392ce544017d14fc17 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 19 Jun 2013 13:36:27 +0300
Subject: Don't use -d32 when building 64-bit code

Change-Id: I83a960cebb8347170a08d2fda7ed11050b8c4229
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 3f36bcae67c8..51a534f57f96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6253,7 +6253,7 @@ if test "$SOLAR_JAVA" != ""; then
         fi
         JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
         JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
-    elif test "$_os" = "Darwin"; then
+    elif test $_os = Darwin -a "$BITNESS_OVERRIDE" = ""; then
         dnl HACK:  There currently is only a 32 bit version of LibreOffice for Mac OS X,
         dnl and Tiger Java complains about -d32 while Snow Leopard Java needs it
         dnl to run in 32 bit mode and be able to load LibreOffice jnilibs:
-- 
cgit