diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-11-05 22:05:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 22:05:55 +0000 |
| commit | 0f91b845f92f64aae9ec14eafd7bc03f1f74f70b (patch) | |
| tree | 065598eabc95553548a50b187a9eb2c644f2b7d5 | |
| parent | 60af0534914731a1a0d0dea9931b54040e0c9607 (diff) | |
| parent | 7c722c2f269de217c29a38f69b96e1dba9752873 (diff) | |
| download | google-breakpad-0f91b845f92f64aae9ec14eafd7bc03f1f74f70b.tar.gz | |
Work around llvm bug with -mno-stackrealign.
am: 7c722c2f26
* commit '7c722c2f269de217c29a38f69b96e1dba9752873':
Work around llvm bug with -mno-stackrealign.
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 5 insertions, 11 deletions
@@ -48,12 +48,9 @@ LOCAL_C_INCLUDES := \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES) -ifeq ($(TARGET_ARCH),x86) -# Temporarily build without clang, until b/25435766 fixes core2md segfault. -LOCAL_CLANG := false -else +# Work around b/25435766 core2md segfault. +LOCAL_CLANG_CFLAGS_x86 += -mno-stackrealign LOCAL_CLANG := true -endif include $(BUILD_STATIC_LIBRARY) @@ -69,12 +66,9 @@ LOCAL_SRC_FILES := src/tools/linux/core2md/core2md.cc LOCAL_STATIC_LIBRARIES := breakpad_client -ifeq ($(TARGET_ARCH),x86) -# Temporarily build without clang, until b/25435766 fixes core2md segfault. -LOCAL_CLANG := false -else +# Work around b/25435766 core2md segfault. +LOCAL_CLANG_CFLAGS_x86 += -mno-stackrealign LOCAL_CLANG := true -endif include $(BUILD_EXECUTABLE) @@ -108,4 +102,4 @@ LOCAL_SRC_FILES_linux := \ src/common/linux/linux_libc_support.cc \ src/common/linux/memory_mapped_file.cc \ src/tools/linux/dump_syms/dump_syms.cc -include $(BUILD_HOST_EXECUTABLE)
\ No newline at end of file +include $(BUILD_HOST_EXECUTABLE) |