Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b954f4c authored by Ben Cheng's avatar Ben Cheng Committed by Gerrit Code Review
Browse files

Merge "Add the search path for libgcc.a and crt*.o."

parents 4f92abad 71c36eb4
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ libm_root := bionic/libm
libstdc++_root := bionic/libstdc++
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
# symlinks located in out/ to point to the appropriate kernel
@@ -148,14 +150,12 @@ TARGET_C_INCLUDES := \
	$(libm_root)/include/aarch64 \
	$(libthread_db_root)/include

# FIXME
# CRT* objects to be added later
TARGET_CRTBEGIN_STATIC_O :=
TARGET_CRTBEGIN_DYNAMIC_O :=
TARGET_CRTEND_O :=
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
TARGET_CRTEND_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o

TARGET_CRTBEGIN_SO_O :=
TARGET_CRTEND_SO_O :=
TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o

TARGET_STRIP_MODULE:=true