cmake: Fix dependencies for LD script generation #13182
Merged
Conversation
This file contains hidden or 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
This commit applies various refactorings and whitespace fixes in preparation for the patch that fixes zephyrproject-rtos#13001. It includes changing indentation from tabs to spaces and splitting tokens across more lines to increase readability and minimize patch sizes. Signed-off-by: Sebastian Bøe <[email protected]>
To be able to correctly express that preprocessing a file will depend on targets and files we enhance the LD script preprocessing function by adding all trailing arguments to the DEPENDS section of the custom command. Signed-off-by: Sebastian Bøe <[email protected]>
The dependencies relating to generating LD scripts are declared incorrectly. This manifests itself as broken incremental builds as shown in zephyrproject-rtos#13001. This commit aligns the LD script generation with the Zephyr standard for declaring custom commands. For instance, custom commands should generate files that are wrapped by targets. The custom commands should declare the dependencies, not the targets. Also, when using custom commands, the OUTPUT signature should be used, not the TARGET signature, as app_smem was doing. For details about how Zephyr uses custom commands see https://samthursfield.wordpress.com/2015/11/21/cmake-dependencies-between-targets-and-files-and-custom-commands/ This fixes zephyrproject-rtos#13001. Signed-off-by: Sebastian Bøe <[email protected]>
|
Thanks for looking into this, will do some tests later today |
andrewboie
approved these changes
Feb 8, 2019
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.
The dependencies relating to generating LD scripts are declared
incorrectly. This manifests itself as broken incremental builds as
shown in #13001.
This commit aligns the LD script generation with the Zephyr standard
for declaring custom commands.
For instance, custom commands should generate files that are wrapped
by targets. The custom commands should declare the dependencies, not
the targets.
Also, when using custom commands, the OUTPUT signature should be used,
not the TARGET signature, as app_smem was doing.
For details about how Zephyr uses custom commands see
https://samthursfield.wordpress.com/2015/11/21/cmake-dependencies-between-targets-and-files-and-custom-commands/
This fixes #13001.