xin/am-kernels
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: fix unneeded dependency on npcgcc
All checks were successful
Build nix packages / build-matrix (am-kernels) (push) Successful in 2m24s
Details
Build nix packages / build-matrix (rv32Cross.am-kernels-nemu) (push) Successful in 2m20s
Details
Build nix packages / build-matrix (rv32Cross.am-kernels-npc) (push) Successful in 2m21s
Details

Browse source
This commit is contained in:
xinyangli 2024-08-15 16:42:02 +08:00
parent b99fc98d8d
commit f6c3a13e7f
Signed by: xin
SSH key fingerprint: SHA256:qZ/tzd8lYRtUFSrfBDBMcUqV4GHKxqeqRA3huItgvbk
7 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
benchmarks/microbench/src/CMakeLists.txt
View file

@ -13,7 +13,7 @@ add_executable(bench
fib/fib.c
)
target_link_libraries(bench am-${ARCH} klib npcgcc)
target_link_libraries(bench am-${ARCH} klib)
# -- Extract binary file from ELF
add_custom_command(TARGET bench

8
flake.lock
View file

@ -941,11 +941,11 @@
"pre-commit-hooks": "pre-commit-hooks_5"
},
"locked": {
"lastModified": 1723709622,
"narHash": "sha256-xL65SDXbE+5sqS2Vv+JEQyrPMrNW3Crc6NmZYy6L9QM=",
"lastModified": 1723711136,
"narHash": "sha256-wwVG49IBLtyb2mZ9kNGojuJSYa4evf/2IEcdx8HZxKA=",
"ref": "refs/heads/master",
"rev": "1f3e64bb379756394c4aea7a55aaf37555bd5a6c",
"revCount": 124,
"rev": "3d64dbd200ab3e944b99df76ba884abb2cdbbef6",
"revCount": 125,
"type": "git",
"url": "https://git.xinyang.life/xin/ysyx-workbench"
},

2
kernels/demo/src/CMakeLists.txt
View file

@ -10,7 +10,7 @@ add_executable(demo
main.c
)
target_include_directories(demo PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include)
target_link_libraries(demo PRIVATE am-${ARCH} klib npcgcc)
target_link_libraries(demo PRIVATE am-${ARCH} klib)
# -- Extract binary file from ELF
add_custom_command(TARGET demo

5
kernels/hello/CMakeLists.txt
View file

@ -2,9 +2,8 @@ add_executable(hello
hello.c
)
target_include_directories(hello PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include)
target_link_libraries(hello PRIVATE am-${ARCH} klib npcgcc)
target_compile_options(hello PRIVATE -nostdlib -nodefaultlibs)
target_link_options(hello PRIVATE -nostdlib -nodefaultlibs)
target_link_libraries(hello PRIVATE am-${ARCH} klib)
# -- Extract binary file from ELF
add_custom_command(TARGET hello

2
kernels/yield-os/CMakeLists.txt
View file

@ -1,7 +1,7 @@
add_executable(yield-os
yield-os.c
)
target_link_libraries(yield-os PRIVATE am-${ARCH} klib npcgcc)
target_link_libraries(yield-os PRIVATE am-${ARCH} klib)
# -- Extract binary file from ELF
add_custom_command(TARGET yield-os

5
tests/alu-tests/CMakeLists.txt
View file

@ -17,9 +17,8 @@
add_executable(alu_test alu_test.c)
target_include_directories(alu_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include)
target_link_libraries(alu_test PRIVATE am-${ARCH} klib npcgcc)
target_compile_options(alu_test PRIVATE -nostdlib -nodefaultlibs)
target_link_options(alu_test PRIVATE -nostdlib -nodefaultlibs)
target_link_libraries(alu_test PRIVATE am-${ARCH} klib)
# -- Extract binary file from ELF
add_custom_command(TARGET alu_test

4
tests/am-tests/src/CMakeLists.txt
View file

@ -11,10 +11,10 @@ add_executable(am-tests
tests/vm.c
main.c
)
# set_property(SOURCE tests/audio/audio-data.S APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/audio/little-star.pcm)
# set_propertygSOURCE tests/audio/audio-data.S APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/audio/little-star.pcm)
target_include_directories(am-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include)
target_link_libraries(am-tests PRIVATE am-${ARCH} klib npcgcc)
target_link_libraries(am-tests PRIVATE am-${ARCH} klib)
# -- Extract binary file from ELF
add_custom_command(TARGET am-tests