From 1682c63d777d7b008415c2166dd896444e3f1596 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 23 Jan 2014 15:15:28 -0800 Subject: [PATCH] Use arch-specific variable to set up the x86 ld flags. Bug: 11654773 Change-Id: I9e9075bac1303cfa39b0f717dd74625ce1dd5fa5 --- libdl/Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libdl/Android.mk b/libdl/Android.mk index 49cfb0c8a..3d60474f0 100644 --- a/libdl/Android.mk +++ b/libdl/Android.mk @@ -18,9 +18,8 @@ include $(CLEAR_VARS) LOCAL_LDFLAGS := -Wl,--exclude-libs=libgcc.a # for x86, exclude libgcc_eh.a for the same reasons as above -ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) -LOCAL_LDFLAGS += -Wl,--exclude-libs=libgcc_eh.a -endif +LOCAL_LDFLAGS_x86 := -Wl,--exclude-libs=libgcc_eh.a +LOCAL_LDFLAGS_x86_64 := $(LOCAL_LDFLAGS_x86) LOCAL_SRC_FILES:= libdl.c LOCAL_CFLAGS := -Wall -Wextra -Werror