aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRashed Abdel-Tawab <rashed@linux.com>2017-10-28 21:31:09 -0700
committerRashed Abdel-Tawab <rashed@linux.com>2017-12-05 22:33:35 -0800
commit8881ac638f8495940b4ac39ce6a8d75f85f5240b (patch)
tree6c45da8994c6ceda35d8e2e47fe34e777245bdcb
parentc49a567648db6c02d253b9474a7b1f242414cdd9 (diff)
downloadandroid_external_bash-8881ac638f8495940b4ac39ce6a8d75f85f5240b.tar.gz
android_external_bash-8881ac638f8495940b4ac39ce6a8d75f85f5240b.tar.bz2
android_external_bash-8881ac638f8495940b4ac39ce6a8d75f85f5240b.zip
bash: Disable clang
lib/readline/histexpand.c causes clang 5.0 to segfault and I'm tired of dealing with this crap, so just fallback to GCC until someone figures it out. Change-Id: I157aec19543e6b45d481ca00165bf9cc3883862b
-rw-r--r--Android.mk2
-rw-r--r--lib/readline/Android.mk3
2 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 87a1b7a..c762d31 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,4 @@
+LOCAL_CLANG_EXCEPTION_PROJECTS += external/bash
LOCAL_PATH:= $(call my-dir)
# ========================================================
@@ -41,6 +42,7 @@ LOCAL_MODULE := bash
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
+LOCAL_CLANG := false
include $(BUILD_EXECUTABLE)
diff --git a/lib/readline/Android.mk b/lib/readline/Android.mk
index 0509f98..eb02789 100644
--- a/lib/readline/Android.mk
+++ b/lib/readline/Android.mk
@@ -1,3 +1,4 @@
+LOCAL_CLANG_EXCEPTION_PROJECTS += external/bash/lib/readline
LOCAL_PATH:= $(call my-dir)
# ========================================================
@@ -26,6 +27,7 @@ LOCAL_CFLAGS += \
LOCAL_MODULE := libhistory
LOCAL_MODULE_TAGS := eng
+LOCAL_CLANG := false
include $(BUILD_STATIC_LIBRARY)
@@ -81,6 +83,7 @@ LOCAL_CFLAGS += \
LOCAL_MODULE := libreadline
LOCAL_MODULE_TAGS := eng
+LOCAL_CLANG := false
include $(BUILD_STATIC_LIBRARY)