From fbc3ae4ed4a7ae2dfeaf84408d0f003d62871d98 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 12 Jan 2011 23:33:50 +0100 Subject: Better support for 64-bit clearsilver build. This patch ensures that ClearSilver is built as 64-bit even if a 32-bit host toolchain is used by default (e.g. when building the Linux SDK). Change-Id: I706ccb259cdcf255902ec91424fa6ef6fc859cb0 --- cgi/Android.mk | 4 ++++ cs/Android.mk | 4 ++++ java-jni/Android.mk | 4 ++++ util/Android.mk | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/cgi/Android.mk b/cgi/Android.mk index 21c534b..071c9c4 100644 --- a/cgi/Android.mk +++ b/cgi/Android.mk @@ -15,6 +15,10 @@ LOCAL_CFLAGS := -fPIC # This forces a 64-bit build for Java6 LOCAL_CFLAGS += -m64 LOCAL_LDFLAGS += -m64 +# We use the host compilers because the Linux SDK build +# uses a 32-bit toolchain that can't handle -m64 +LOCAL_CC := $(CC) +LOCAL_CXX := $(CXX) LOCAL_NO_DEFAULT_COMPILER_FLAGS := true diff --git a/cs/Android.mk b/cs/Android.mk index 9f0e30a..51f2bb1 100644 --- a/cs/Android.mk +++ b/cs/Android.mk @@ -11,6 +11,10 @@ LOCAL_CFLAGS := -fPIC # This forces a 64-bit build for Java6 LOCAL_CFLAGS += -m64 LOCAL_LDFLAGS += -m64 +# We use the host compilers because the Linux SDK build +# uses a 32-bit toolchain that can't handle -m64 +LOCAL_CC := $(CC) +LOCAL_CXX := $(CXX) LOCAL_NO_DEFAULT_COMPILER_FLAGS := true diff --git a/java-jni/Android.mk b/java-jni/Android.mk index 21b4fd1..64c3c0f 100644 --- a/java-jni/Android.mk +++ b/java-jni/Android.mk @@ -36,6 +36,10 @@ LOCAL_CFLAGS += -fPIC # This forces a 64-bit build for Java6 LOCAL_CFLAGS += -m64 LOCAL_LDFLAGS += -m64 +# We use the host compilers because the Linux SDK build +# uses a 32-bit toolchain that can't handle -m64 +LOCAL_CC := $(CC) +LOCAL_CXX := $(CXX) LOCAL_NO_DEFAULT_COMPILER_FLAGS := true diff --git a/util/Android.mk b/util/Android.mk index 386f379..93f24c9 100644 --- a/util/Android.mk +++ b/util/Android.mk @@ -20,6 +20,10 @@ LOCAL_CFLAGS := -fPIC # This forces a 64-bit build for Java6 LOCAL_CFLAGS += -m64 LOCAL_LDFLAGS += -m64 +# We use the host compilers because the Linux SDK build +# uses a 32-bit toolchain that can't handle -m64 +LOCAL_CC := $(CC) +LOCAL_CXX := $(CXX) LOCAL_NO_DEFAULT_COMPILER_FLAGS := true -- cgit v1.2.3