Skip to content

CMake: Use find_program instead of which to find gcc toolchain #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

CMake: Use find_program instead of which to find gcc toolchain #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmake/toolchain_aarch64-none-elf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ set(MARCH_FLAGS "-march=armv8-a")
set(TOOLCHAIN aarch64-none-elf)
set(CMAKE_CXX_STANDARD 20)

execute_process(
COMMAND which ${TOOLCHAIN}-gcc
OUTPUT_VARIABLE TOOLCHAIN_GCC_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE)
find_program(TOOLCHAIN_GCC_PATH
NAMES ${TOOLCHAIN}-gcc
HINTS $ENV{PATH}
)

# get toolchain version. CMAKE_C_COMPILER_VERSION cannot be used here since its not defined until
# `project()` is run in the top-level cmake. The toolchain has to be setup before the `project` call
Expand Down
8 changes: 4 additions & 4 deletions cmake/toolchain_arm-none-eabi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ endif()
set(TOOLCHAIN arm-none-eabi)
set(CMAKE_CXX_STANDARD 20)

execute_process(
COMMAND which ${TOOLCHAIN}-gcc
OUTPUT_VARIABLE TOOLCHAIN_GCC_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE)
find_program(TOOLCHAIN_GCC_PATH
NAMES ${TOOLCHAIN}-gcc
HINTS $ENV{PATH}
)

# get toolchain version. CMAKE_C_COMPILER_VERSION cannot be used here since its not defined until
# `project()` is run in the top-level cmake. The toolchain has to be setup before the `project` call
Expand Down