LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Disable linker warnings on MIPS builds to work around relocation issue."

Browse Source
This commit is contained in:
Stephen Hines
2014-04-30 21:02:37 +00:00
committed by Gerrit Code Review
parent abc15f529e 3486f698a3
commit 1f76ece739
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Android.mk
View File

@@ -17,8 +17,6 @@
# Don't build for unbundled branches # Don't build for unbundled branches
ifeq (,$(TARGET_BUILD_APPS)) ifeq (,$(TARGET_BUILD_APPS))
# libcxx isn't working on mips yet
ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH), mips mips64))
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
LIBCXX_SRC_FILES := \ LIBCXX_SRC_FILES := \
@@ -65,6 +63,15 @@ LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS)
LOCAL_SYSTEM_SHARED_LIBRARIES := libc LOCAL_SYSTEM_SHARED_LIBRARIES := libc
LOCAL_SHARED_LIBRARIES := libcxxabi LOCAL_SHARED_LIBRARIES := libcxxabi
# Bug: 14296739
# The MIPS target in LLVM is spuriously generating a text relocation for
# __gxx_personality_v0 in the .eh_frame section. This triggers a linker
# warning, since it is not considered PIC. Disable warnings as errors
# for this link step until we can get the bug fixed.
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH), mips mips64))
LOCAL_LDFLAGS := -Wl,--no-fatal-warnings
endif
ifneq ($(TARGET_ARCH),arm) ifneq ($(TARGET_ARCH),arm)
LOCAL_SHARED_LIBRARIES += libdl LOCAL_SHARED_LIBRARIES += libdl
endif endif
@@ -89,6 +96,5 @@ endif
LOCAL_SHARED_LIBRARIES := libcxxabi LOCAL_SHARED_LIBRARIES := libcxxabi
include $(BUILD_HOST_SHARED_LIBRARY) include $(BUILD_HOST_SHARED_LIBRARY)
endif
endif # TARGET_BUILD_APPS endif # TARGET_BUILD_APPS