From 50e66a2e53b726f1e4132e9710aa5a0226dfe42d Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 26 Sep 2022 10:50:01 +0000 Subject: [PATCH] riscv: use /opt/riscv path in toolchain - align with defaults from https://github.com/riscv-collab/riscv-gnu-toolchain --- platforms/linux/riscv64-clang.toolchain.cmake | 2 +- platforms/linux/riscv64-gcc.toolchain.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platforms/linux/riscv64-clang.toolchain.cmake b/platforms/linux/riscv64-clang.toolchain.cmake index 2efd67ad93..13bca12741 100644 --- a/platforms/linux/riscv64-clang.toolchain.cmake +++ b/platforms/linux/riscv64-clang.toolchain.cmake @@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR riscv64) set(RISCV_CLANG_BUILD_ROOT /opt/rvv-llvm CACHE PATH "Path to CLANG for RISC-V cross compiler build directory") -set(RISCV_GCC_INSTALL_ROOT /opt/RISCV CACHE PATH "Path to GCC for RISC-V cross compiler installation directory") +set(RISCV_GCC_INSTALL_ROOT /opt/riscv CACHE PATH "Path to GCC for RISC-V cross compiler installation directory") set(CMAKE_SYSROOT ${RISCV_GCC_INSTALL_ROOT}/sysroot CACHE PATH "RISC-V sysroot") set(CLANG_TARGET_TRIPLE riscv64-unknown-linux-gnu) diff --git a/platforms/linux/riscv64-gcc.toolchain.cmake b/platforms/linux/riscv64-gcc.toolchain.cmake index 0be3a2a2b8..2da0fb7bd4 100644 --- a/platforms/linux/riscv64-gcc.toolchain.cmake +++ b/platforms/linux/riscv64-gcc.toolchain.cmake @@ -3,12 +3,12 @@ set(CMAKE_SYSTEM_PROCESSOR riscv64) if(NOT DEFINED CMAKE_C_COMPILER) find_program(CMAKE_C_COMPILER NAMES riscv64-unknown-linux-gnu-gcc - PATHS /opt/RISCV/bin ENV PATH) + PATHS /opt/riscv/bin ENV PATH) endif() if(NOT DEFINED CMAKE_CXX_COMPILER) find_program(CMAKE_CXX_COMPILER NAMES riscv64-unknown-linux-gnu-g++ - PATHS /opt/RISCV/bin ENV PATH) + PATHS /opt/riscv/bin ENV PATH) endif() get_filename_component(RISCV_GCC_INSTALL_ROOT ${CMAKE_C_COMPILER} DIRECTORY)