build: mk/lib.mk: use full path to shared library in flags variable #5834
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -60,14 +60,14 @@ $(lib-libfile): $(objs) | |||
| endif | |||
| ifeq ($(CFG_ULIBS_SHARED),y) | |||
| ifeq ($(sm)-$(CFG_TA_BTI),ta_arm64-y) | |||
| lib-ldflags$(libuuid) += $$(call ld-option,-z force-bti) --fatal-warnings | |||
| lib-ldflags$(lib-shlibfile) += $$(call ld-option,-z force-bti) --fatal-warnings | |||
There was a problem hiding this comment.
lib-shlibfile is empty when CFG_ULIBS_SHARED isn't y
There was a problem hiding this comment.
Hmm, this comment would be more relevant below at line 70.
There was a problem hiding this comment.
Line 70 is stilll in the ifeq ($(CFG_ULIBS_SHARED),y) .. endif block
There was a problem hiding this comment.
My bad, you're right.
jforissier
force-pushed
the
shlib-flags
branch
2 times, most recently
from
570bb55
to
cdf0097
Compare
|
|
To add link flags for a shared library, a makefile variable is used that is called lib-ldflags$(libuuid). That's incorrect because the UUID is not enough to uniquely identify a shared library in the build. For example when both 32-bit and 64-bit user space is generated there are two versions of the shared library with the same UUID. It is not a problem at the moment because lib-ldflags$(libuuid) is used only for one target: ta_arm64, but fix this anyways so that the variable may be used for more complex cases. Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
jforissier
force-pushed
the
shlib-flags
branch
from
cdf0097
to
28e8d39
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To add link flags for a shared library, a makefile variable is used that is called lib-ldflags$(libuuid). That's incorrect because the UUID is not enough to uniquely identify a shared library in the build. For example when both 32-bit and 64-bit user space is generated there are two versions of the shared library with the same UUID. It is not a problem at the moment because lib-ldflags$(libuuid) is used only for one target: ta_arm64, but fix this anyways so that the variable may be used for more complex cases.