gnu: Add legacy Zephyr compatibility #989
Open
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
In setup.sh, add option to create symlinks from gnu/ so that paths match previous SDK versions. In Zephyr-sdkConfig.cmake, set ZEPHYR_TOOLCHAIN_VARIANT to zephyr/gnu only when Zephyr sets ZEPHYR_TOOLCHAIN_VARIANT_COMPILER_SUPPORT before finding the SDK module. This will require a change to Zephyr, which is unfortunate. Ideally, we'd use some existing mechanism to detect when to make this switch. Signed-off-by: Keith Packard <[email protected]>
stephanosio
reviewed
Aug 1, 2025
| @@ -117,6 +118,8 @@ user_prompt() | |||
| # Environment Configurations | |||
| ask_yn "Register Zephyr SDK CMake package" && do_cmake_pkg="y" | |||
|
|
|||
| ask_yn "Old zephyr version compatibility" && do_old_zephyr="y" | |||
There was a problem hiding this comment.
Suggested change
| ask_yn "Old zephyr version compatibility" && do_old_zephyr="y" | |
| ask_yn "Create symbolic links for old Zephyr compatibility" && do_old_zephyr="y" |
| @@ -69,6 +69,7 @@ usage() | |||
| echo " all Install all GNU toolchains" | |||
| echo " -l Install LLVM toolchain" | |||
| echo " -h Install host tools" | |||
| echo " -o Old zephyr version compatibility" | |||
There was a problem hiding this comment.
Suggested change
| echo " -o Old zephyr version compatibility" | |
| echo " -o Create symbolic links matching the old SDK layout for old Zephyr (<= 4.2) compatibility" |
Comment on lines
+313
to
+314
| ln -sr gnu/* . || assert_rc "ERROR: Creating toolchain links" 50 | ||
| ln -sr cmake/zephyr/gnu/* cmake/zephyr || assert_rc "ERROR: Creating cmake links" 50 |
There was a problem hiding this comment.
We also need to symlink hosttools/* to . for host tools.
stephanosio
reviewed
Aug 1, 2025
stephanosio
reviewed
Aug 1, 2025
Comment on lines
-16
to
+20
| set(ZEPHYR_TOOLCHAIN_VARIANT "zephyr/gnu") | ||
| if(DEFINED ZEPHYR_TOOLCHAIN_VARIANT_COMPILER_SUPPORT) | ||
| set(ZEPHYR_TOOLCHAIN_VARIANT "zephyr/gnu") | ||
| else() | ||
| set(ZEPHYR_TOOLCHAIN_VARIANT "zephyr") | ||
| endif() |
There was a problem hiding this comment.
In Zephyr-sdkConfig.cmake, set ZEPHYR_TOOLCHAIN_VARIANT to zephyr/gnu only when Zephyr sets ZEPHYR_TOOLCHAIN_VARIANT_COMPILER_SUPPORT before finding the SDK module. This will require a change to Zephyr, which is unfortunate. Ideally, we'd use some existing mechanism to detect when to make this switch.
What about using Zephyr version?
SDK 1.0.0 support will be available from Zephyr 4.3.0 (well, 4.2.99/main at this time), so we can set the default ZEPHYR_TOOLCHAIN_VARIANT=zephyr when Zephyr_VERSION VERSION_LESS 4.2.99
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.
In setup.sh, add option to create symlinks from gnu/ so that paths match previous SDK versions.
In Zephyr-sdkConfig.cmake, set ZEPHYR_TOOLCHAIN_VARIANT to zephyr/gnu only when Zephyr sets ZEPHYR_TOOLCHAIN_VARIANT_COMPILER_SUPPORT before finding the SDK module. This will require a change to Zephyr, which is unfortunate. Ideally, we'd use some existing mechanism to detect when to make this switch.
Fixes #851