Detect PICO_COMPILER automatically when PICO_TOOLCHAIN_PATH is set#2937
Open
kilograham wants to merge 1 commit into
Open
Detect PICO_COMPILER automatically when PICO_TOOLCHAIN_PATH is set#2937kilograham wants to merge 1 commit into
kilograham wants to merge 1 commit into
Conversation
will-v-pi
reviewed
May 15, 2026
| @@ -1,4 +1,7 @@ | |||
| # PICO_CMAKE_CONFIG: PICO_TOOLCHAIN_PATH, Path to search for compiler, type=string, default=none (i.e. search system paths), group=build, docref=cmake-toolchain-config | |||
| if (NOT PICO_TOOLCHAIN_PATH AND DEFINED ENV{PICO_TOOLCHAIN_PATH}) | |||
| set(PICO_TOOLCHAIN_PATH $ENV{PICO_TOOLCHAIN_PATH}) | |||
Contributor
There was a problem hiding this comment.
Should have a message, like the other bits like this (eg PICO_SDK_PATH in pico_sdk_import.cmake)
Suggested change
| set(PICO_TOOLCHAIN_PATH $ENV{PICO_TOOLCHAIN_PATH}) | |
| set(PICO_TOOLCHAIN_PATH $ENV{PICO_TOOLCHAIN_PATH}) | |
| message("Using PICO_TOOLCHAIN_PATH from environment ('${PICO_TOOLCHAIN_PATH}')") |
| pico_message("Defaulting compiler (PICO_COMPILER) to '${PICO_DEFAULT_COMPILER}' since not specified.") | ||
| if (PICO_TOOLCHAIN_PATH) | ||
| if (PICO_DEFAULT_GCC_COMPILER) | ||
| FILE(GLOB _COMPILER "${PICO_TOOLCHAIN_PATH}/bin/*gcc*") |
Contributor
There was a problem hiding this comment.
We currently support PICO_TOOLCHAIN_PATH being set to the bin folder of the toolchain, so this should also search for ${PICO_TOOLCHAIN_PATH}/*gcc*
Suggested change
| FILE(GLOB _COMPILER "${PICO_TOOLCHAIN_PATH}/bin/*gcc*") | |
| file(GLOB _COMPILER "${PICO_TOOLCHAIN_PATH}/bin/*gcc*" "${PICO_TOOLCHAIN_PATH}/*gcc*") |
(also lowercase file for consistency as that's what we use elsewhere)
| endif() | ||
| endif() | ||
| if (NOT PICO_COMPILER AND PICO_DEFAULT_CLANG_COMPILER) | ||
| FILE(GLOB _COMPILER "${PICO_TOOLCHAIN_PATH}/bin/*llvm*") |
Contributor
There was a problem hiding this comment.
Same as above
Suggested change
| FILE(GLOB _COMPILER "${PICO_TOOLCHAIN_PATH}/bin/*llvm*") | |
| file(GLOB _COMPILER "${PICO_TOOLCHAIN_PATH}/bin/*llvm*" "${PICO_TOOLCHAIN_PATH}/*llvm*") |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 passing with other compiler/clib related changes, this PR removes the need to specify
PICO_COMPILERwhen already specifyingPICO_TOOLCHAIN_PATHThus
PICO_DEFAULT_COMPILERis now only used if you have neither specifiedPICO_COMPILERor a toolchain file/path in which case you're basically looking in the users path environment at which point it's not a bad idea to pick one to look for (we could even help there, but that is a more involved change)