Compare commits

..

No commits in common. "24f01edf74a176351f13124bee0f8b65af51174d" and "a376d27260aa49dbf643dbddb000ae6bdd37c70a" have entirely different histories.

2 changed files with 7 additions and 9 deletions

View file

@ -10,7 +10,6 @@ TEMPLATE_FILES=".template_files"
MODULE_DIR="${TEMPLATE_FILES}/modules" MODULE_DIR="${TEMPLATE_FILES}/modules"
TEST_MODULE_DIR="${TEMPLATE_FILES}/test_module" TEST_MODULE_DIR="${TEMPLATE_FILES}/test_module"
CHIP="ch32v003" CHIP="ch32v003"
PROJECT_NAME="WCH_Template"
generate_tags_file () { generate_tags_file () {
echo "generate_tags_file()" echo "generate_tags_file()"
@ -285,8 +284,7 @@ build_hex () {
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${WCH_TC}" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${WCH_TC}"
cmake ${CMAKE_ARGS} ../ cmake ${CMAKE_ARGS} ../
make ${PROJECT_NAME} make main
#make main
#make hex #make hex
} }

View file

@ -32,9 +32,9 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
# This logic checks the operating system. # This logic checks the operating system.
if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD") if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD")
message("OS:: FreeBSD") message("OS:: FreeBSD")
#set(ALTCLIB /usr/local/riscv/riscv32-unknown-elf/include) #set(NEWLIB /usr/local/riscv/riscv32-unknown-elf/include)
#set(ALTCLIB /usr/local/lib/gcc/riscv32-unknown-elf/11.3.00/include) #set(NEWLIB /usr/local/lib/gcc/riscv32-unknown-elf/11.3.00/include)
set(ALTCLIB /compat/linux/opt/riscv/riscv-none-elf/include) set(NEWLIB /compat/linux/opt/riscv/riscv-none-elf/include)
set(CMAKE_C_COMPILER riscv-none-elf-gcc) set(CMAKE_C_COMPILER riscv-none-elf-gcc)
set(CMAKE_CXX_COMPILER riscv-none-elf-g++) set(CMAKE_CXX_COMPILER riscv-none-elf-g++)
set(CMAKE_ASM_COMPILER riscv-none-elf-gcc) set(CMAKE_ASM_COMPILER riscv-none-elf-gcc)
@ -52,8 +52,8 @@ if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD")
elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
message("OS:: LINUX") message("OS:: LINUX")
set(ALTCLIB /opt/riscv/riscv-none-elf/include) set(NEWLIB /opt/riscv/riscv-none-elf/include)
#set(ALTCLIB /usr/lib/gcc/riscv64-unknown-elf/12.2.0/include) #set(NEWLIB /usr/lib/gcc/riscv64-unknown-elf/12.2.0/include)
set(CMAKE_C_COMPILER riscv-none-elf-gcc) set(CMAKE_C_COMPILER riscv-none-elf-gcc)
set(CMAKE_CXX_COMPILER riscv-none-elf-g++) set(CMAKE_CXX_COMPILER riscv-none-elf-g++)
set(CMAKE_ASM_COMPILER riscv-none-elf-gcc) set(CMAKE_ASM_COMPILER riscv-none-elf-gcc)
@ -114,7 +114,7 @@ set(OBJECT_GEN_FLAGS "\
set(C_FLAGS_ARCH "\ set(C_FLAGS_ARCH "\
-march=rv32ec \ -march=rv32ec \
-mabi=ilp32e \ -mabi=ilp32e \
-I${ALTCLIB} \ -I${NEWLIB} \
-nostdlib") -nostdlib")
#------------------- #-------------------