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

Commit 19f5d7db authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 387e4d06: LOCAL_LDFLAGS should come after TARGET_GLOBAL_LDFLAGS

parents 03db52ff 387e4d06

core/combo/TARGET_linux-arm.mk

+3 −3
Original line number Diff line number Diff line
@@ -222,8 +222,8 @@ $(TARGET_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-o $@ \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_FDO_LIB) \

	$(TARGET_LIBGCC)

endef
@@ -240,8 +240,8 @@ $(TARGET_CXX) -nostdlib -Bdynamic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ 
	$(TARGET_CRTBEGIN_DYNAMIC_O) \

	$(PRIVATE_ALL_OBJECTS) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_FDO_LIB) \

	$(TARGET_LIBGCC) \

	$(TARGET_CRTEND_O)
@@ -253,8 +253,8 @@ $(TARGET_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ 
	-o $@ \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(TARGET_CRTBEGIN_STATIC_O) \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(TARGET_FDO_LIB) \