diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-01-19 14:15:06 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-01-19 14:15:06 -0800 |
| commit | ac5c7346acaddbdf7fcb2ffa48761fdb299d4df3 (patch) | |
| tree | c0335d6ebab1d7761bffb80d4d775f0bc595e34d | |
| parent | 154dfff8766839d10fbb3311555338f3b9f0c774 (diff) | |
| parent | 77b05ec00e4265826402fa2bac536fe1aa36e60b (diff) | |
| download | clearsilver-tools_r9.tar.gz | |
Merge "Better support for 64-bit clearsilver build." into tools_r9tools_r9
| -rw-r--r-- | cgi/Android.mk | 4 | ||||
| -rw-r--r-- | cs/Android.mk | 4 | ||||
| -rw-r--r-- | java-jni/Android.mk | 4 | ||||
| -rw-r--r-- | util/Android.mk | 4 |
4 files changed, 16 insertions, 0 deletions
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 |