diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-17 17:41:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-17 17:41:43 -0700 |
| commit | 81b4698059c37ac36aa74d1498bef5654580ad3f (patch) | |
| tree | 4d207b18bc666a84ff69a6a870720fb7b8f79b49 | |
| parent | b6b2375df8ca63a5e349d8277d425ab58e16aeb1 (diff) | |
| parent | f8a66bb31204b42f830c1865a795b5f3eb1e0147 (diff) | |
| download | bionic-81b4698059c37ac36aa74d1498bef5654580ad3f.zip bionic-81b4698059c37ac36aa74d1498bef5654580ad3f.tar.gz bionic-81b4698059c37ac36aa74d1498bef5654580ad3f.tar.bz2 | |
am f8a66bb3: Merge "Remove some non-unused makefile generality."
* commit 'f8a66bb31204b42f830c1865a795b5f3eb1e0147':
Remove some non-unused makefile generality.
| -rw-r--r-- | libc/Android.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 8c75e6d..a6190b1 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -569,23 +569,17 @@ libc_crt_target_cflags += \ # static C++ destructors are properly called on dlclose(). # ifeq ($(TARGET_ARCH),arm) - libc_crtbegin_extension := c libc_crt_target_so_cflags := endif ifeq ($(TARGET_ARCH),mips) - libc_crtbegin_extension := c libc_crt_target_so_cflags := -fPIC endif ifeq ($(TARGET_ARCH),x86) - libc_crtbegin_extension := c libc_crt_target_so_cflags := -fPIC endif -ifeq ($(libc_crtbegin_extension),) - $(error $(TARGET_ARCH) not supported) -endif libc_crt_target_so_cflags += $(libc_crt_target_cflags) -libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.$(libc_crtbegin_extension) -libc_crt_target_crtbegin_so_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.$(libc_crtbegin_extension) +libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.c +libc_crt_target_crtbegin_so_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.c # See the comment in crtbrand.c for the reason why we need to generate # crtbrand.s before generating crtbrand.o. |