am 281778a3: am 72e9dab0: am 7b954f4c: Merge "Add the search path for libgcc.a and crt*.o."

* commit '281778a373f5034195bda7c652e353770dae8242':
  Add the search path for libgcc.a and crt*.o.
This commit is contained in:
Ben Cheng 2013-10-28 10:57:40 -07:00 committed by Android Git Automerger
commit 2972ab341f

View file

@ -125,6 +125,8 @@ libm_root := bionic/libm
libstdc++_root := bionic/libstdc++ libstdc++_root := bionic/libstdc++
libthread_db_root := bionic/libthread_db libthread_db_root := bionic/libthread_db
TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
-print-libgcc-file-name)
# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use # unless CUSTOM_KERNEL_HEADERS is defined, we're going to use
# symlinks located in out/ to point to the appropriate kernel # symlinks located in out/ to point to the appropriate kernel
@ -148,14 +150,12 @@ TARGET_C_INCLUDES := \
$(libm_root)/include/aarch64 \ $(libm_root)/include/aarch64 \
$(libthread_db_root)/include $(libthread_db_root)/include
# FIXME TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
# CRT* objects to be added later TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
TARGET_CRTBEGIN_STATIC_O := TARGET_CRTEND_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
TARGET_CRTBEGIN_DYNAMIC_O :=
TARGET_CRTEND_O :=
TARGET_CRTBEGIN_SO_O := TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
TARGET_CRTEND_SO_O := TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
TARGET_STRIP_MODULE:=true TARGET_STRIP_MODULE:=true