diff options
| author | Ying Wang <wangying@google.com> | 2010-07-13 17:41:14 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-07-13 17:41:14 -0700 |
| commit | b6a1c1802961f40fe4736e80402f849968cd2563 (patch) | |
| tree | a89289d67b35cffd8da9648dfd0346f91346d667 | |
| parent | 1a08100fa9d92c25de32ba4d13fd3958bbcab894 (diff) | |
| download | build-b6a1c1802961f40fe4736e80402f849968cd2563.zip build-b6a1c1802961f40fe4736e80402f849968cd2563.tar.gz build-b6a1c1802961f40fe4736e80402f849968cd2563.tar.bz2 | |
Keep the crt start/end var name of sh consistent with other archs
So that the PRIVATE_ vars get values correctly.
Change-Id: I1eea67f02c5bab5018b3b5fd93904e1ee8643bf7
| -rw-r--r-- | core/combo/TARGET_linux-sh.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/combo/TARGET_linux-sh.mk b/core/combo/TARGET_linux-sh.mk index 6118c07..f373d21 100644 --- a/core/combo/TARGET_linux-sh.mk +++ b/core/combo/TARGET_linux-sh.mk @@ -103,8 +103,8 @@ TARGET_C_INCLUDES := \ TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o TARGET_CRTEND_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o -TARGET_SOBEGIN := $(TARGET_OUT_STATIC_LIBRARIES)/sobegin.o -TARGET_SOEND := $(TARGET_OUT_STATIC_LIBRARIES)/soend.o +TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/sobegin.o +TARGET_CRTEND_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/soend.o TARGET_STRIP_MODULE:=false @@ -117,7 +117,7 @@ $(TARGET_CXX) \ -Wl,--gc-sections -Wl,-z,norelro \ -Wl,-shared,-Bsymbolic \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - $(PRIVATE_TARGET_SOBEGIN) \ + $(PRIVATE_TARGET_CRTBEGIN_SO_O) \ $(PRIVATE_ALL_OBJECTS) \ -Wl,--whole-archive \ $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ @@ -128,7 +128,7 @@ $(TARGET_CXX) \ $(PRIVATE_LDFLAGS) \ $(subst -lrt,, $(subst -lpthread,,$(PRIVATE_LDLIBS))) \ $(PRIVATE_TARGET_LIBGCC) \ - $(PRIVATE_TARGET_SOEND) + $(PRIVATE_TARGET_CRTEND_SO_O) endef define transform-o-to-executable-inner |