From f6c3a13e7feafd763d31f71c5637973811f8c705 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Thu, 15 Aug 2024 16:42:02 +0800
Subject: [PATCH] build: fix unneeded dependency on npcgcc

---
 benchmarks/microbench/src/CMakeLists.txt | 2 +-
 flake.lock                               | 8 ++++----
 kernels/demo/src/CMakeLists.txt          | 2 +-
 kernels/hello/CMakeLists.txt             | 5 ++---
 kernels/yield-os/CMakeLists.txt          | 2 +-
 tests/alu-tests/CMakeLists.txt           | 5 ++---
 tests/am-tests/src/CMakeLists.txt        | 4 ++--
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/benchmarks/microbench/src/CMakeLists.txt b/benchmarks/microbench/src/CMakeLists.txt
index 349cc5c..7fd36c7 100644
--- a/benchmarks/microbench/src/CMakeLists.txt
+++ b/benchmarks/microbench/src/CMakeLists.txt
@@ -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
diff --git a/flake.lock b/flake.lock
index a0bdfcc..dc497e7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -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"
       },
diff --git a/kernels/demo/src/CMakeLists.txt b/kernels/demo/src/CMakeLists.txt
index b58503b..adce99d 100644
--- a/kernels/demo/src/CMakeLists.txt
+++ b/kernels/demo/src/CMakeLists.txt
@@ -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
diff --git a/kernels/hello/CMakeLists.txt b/kernels/hello/CMakeLists.txt
index 0afa490..e307f4f 100644
--- a/kernels/hello/CMakeLists.txt
+++ b/kernels/hello/CMakeLists.txt
@@ -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
diff --git a/kernels/yield-os/CMakeLists.txt b/kernels/yield-os/CMakeLists.txt
index 71f882f..2db7c9c 100644
--- a/kernels/yield-os/CMakeLists.txt
+++ b/kernels/yield-os/CMakeLists.txt
@@ -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
diff --git a/tests/alu-tests/CMakeLists.txt b/tests/alu-tests/CMakeLists.txt
index 4fb0bd4..8d6ed7d 100644
--- a/tests/alu-tests/CMakeLists.txt
+++ b/tests/alu-tests/CMakeLists.txt
@@ -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
diff --git a/tests/am-tests/src/CMakeLists.txt b/tests/am-tests/src/CMakeLists.txt
index b9247bb..2859620 100644
--- a/tests/am-tests/src/CMakeLists.txt
+++ b/tests/am-tests/src/CMakeLists.txt
@@ -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