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

Commit 121aa60c authored by Dan Albert's avatar Dan Albert
Browse files

Link to shared libraries with the full paths. 

This ensures that we're not accidentally linking the wrong version of
a library with the same name thanks to -L.

Test: Still builds.
Change-Id: I22e9e28412844ff4f8bda42ebbc300ea6574e474
parent 4b4fdf0b

core/definitions.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -1692,7 +1692,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

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

	$(PRIVATE_ALL_SHARED_LIBRARIES) \

	-o $@ \

	-o $@ \

	$(PRIVATE_TARGET_CRTEND_SO_O) \

	$(PRIVATE_TARGET_CRTEND_SO_O) \

	$(PRIVATE_LDLIBS)

	$(PRIVATE_LDLIBS)
@@ -1780,7 +1780,7 @@ $(hide) $(PRIVATE_CXX) -pie \ 
	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

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

	$(PRIVATE_ALL_SHARED_LIBRARIES) \

	-o $@ \

	-o $@ \

	$(PRIVATE_TARGET_CRTEND_O) \

	$(PRIVATE_TARGET_CRTEND_O) \

	$(PRIVATE_LDLIBS)

	$(PRIVATE_LDLIBS)