cmake: fixing toolchain_parse_make_rule to correctly handle \ files
#38333
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
|
FYI @epietrowicz |
tejlmand
force-pushed
the
37637_fix_infinite_cmake_configure
branch
4 times, most recently
from
d2cde59
to
494e2fa
Compare
Fixes: zephyrproject-rtos#37637 toolchain_parse_make_rule() parses depfiles and converted `\\` to the CMake list separator `;`. However, gcc -M might create depfiles with windows path separator `\` causing this conversion to fail, as a path like: c:\...\zephyr\samples\drivers\led_ws2812\nrf52-bindings.h resulting in a file list as: c:;...;zephyr;samples;drivers;led_ws2812;nrf52-bindings.h which results in a CMake configure dependency to be added to `C:`. As C: is always newer than the build.ninja file, this resulted in continues CMake re-invocation. As a small side-note, the `\` in file name did only occur in situations where a relative past had been used elsewhere in the build system, such as here: https://github.com/zephyrproject-rtos/zephyr/blob/\ c3050a5/samples/drivers/led_ws2812/\ boards/nrf52dk_nrf52832.overlay#L9 To ensure proper handling of files, then all files are converted to CMake paths, that is with forward slashes: `/` Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
tejlmand
force-pushed
the
37637_fix_infinite_cmake_configure
branch
from
494e2fa
to
904a757
Compare
|
FYI @thedjnK |
mbolivar-nordic
approved these changes
Sep 7, 2021
cfriedt
approved these changes
Sep 10, 2021
|
@nashif - could you please ack as a collaborator? |
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.
Fixes: #37637
toolchain_parse_make_rule() parses depfiles and converted
\\to theCMake list separator
;.However, gcc -M might create depfiles with windows path separator
\causing this conversion to fail, as a path like:
resulting in a file list as:
which results in a CMake configure dependency to be added to
C:.As
C:is always newer than the build.ninja file, this resulted incontinues CMake re-invocation.
As a small side-note, the
\in file name did only occur in situationswhere a relative past had been used elsewhere in the build system, such
as here:
zephyr/samples/drivers/led_ws2812/boards/nrf52dk_nrf52832.overlay
Line 9 in c3050a5
To ensure proper handling of files, then all files are converted to
CMake paths, that is with forward slashes:
/Signed-off-by: Torsten Rasmussen Torsten.Rasmussen@nordicsemi.no