Merge "Disable Clang, due to x86 LDBL_MANT_DIG errors."
This commit is contained in:
commit
4ee7c325df
@ -255,6 +255,10 @@ libm_ld_includes := $(LOCAL_PATH)/upstream-freebsd/lib/msun/ld128/
|
|||||||
# libm.a for target.
|
# libm.a for target.
|
||||||
#
|
#
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
ifneq (,$(filter $(TARGET_ARCH),x86 x86_64))
|
||||||
|
# Clang has wrong long double sizes for x86.
|
||||||
|
LOCAL_CLANG := false
|
||||||
|
endif
|
||||||
LOCAL_MODULE:= libm
|
LOCAL_MODULE:= libm
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
||||||
LOCAL_ARM_MODE := arm
|
LOCAL_ARM_MODE := arm
|
||||||
@ -287,6 +291,10 @@ include $(BUILD_STATIC_LIBRARY)
|
|||||||
# libm.so for target.
|
# libm.so for target.
|
||||||
#
|
#
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
ifneq (,$(filter $(TARGET_ARCH),x86 x86_64))
|
||||||
|
# Clang has wrong long double sizes for x86.
|
||||||
|
LOCAL_CLANG := false
|
||||||
|
endif
|
||||||
LOCAL_MODULE:= libm
|
LOCAL_MODULE:= libm
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
||||||
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
|
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user