From 4860b552d5b879f5834eaa0ab1b7f1e9652772c8 Mon Sep 17 00:00:00 2001 From: tracer-ysyx Date: Mon, 1 Jan 2024 14:26:46 +0800 Subject: [PATCH] =?UTF-8?q?>=20sim=20RTL=20ysyx=5F22040000=20=E6=9D=8E?= =?UTF-8?q?=E5=BF=83=E6=9D=A8=20Linux=20calcite=206.1.69=20#1-NixOS=20SMP?= =?UTF-8?q?=20PREEMPT=5FDYNAMIC=20Wed=20Dec=2020=2016:00:29=20UTC=202023?= =?UTF-8?q?=20x86=5F64=20GNU/Linux=20=2014:26:46=20=20up=20=2023:05,=20=20?= =?UTF-8?q?2=20users,=20=20load=20average:=202.62,=201.66,=201.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- npc/Makefile | 8 +++++--- npc/flake.nix | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/npc/Makefile b/npc/Makefile index bc57bcc..0c5412b 100644 --- a/npc/Makefile +++ b/npc/Makefile @@ -53,9 +53,11 @@ nvboard: CXXFLAGS += -I$(NVBOARD_HOME)/include $(shell sdl2-config --cflags) -g nvboard: $(VSRC) $(CPPSRCS) $(SUBMAKE) $(SRC_AUTO_BIND) $(OBJDIR)/Vexample @NVBOARD_HOME=$(NVBOARD_HOME) $(OBJDIR)/Vexample -compile_commands.json: clean nvboard - bear -- $(MAKE) -i all > - bear -- $(MAKE) -i nvboard +compile_commands.json: clean + bear --output all.json -- $(MAKE) -i all + bear --output nvboard.json -- $(MAKE) -i nvboard + jq -s ".[0] + .[1]" all.json nvboard.json > compile_commands.json + $(RM) all.json nvboard.json clean: $(RM) -r $(PREFIX) diff --git a/npc/flake.nix b/npc/flake.nix index 3d46cc2..3eae8b3 100644 --- a/npc/flake.nix +++ b/npc/flake.nix @@ -14,6 +14,7 @@ gtkwave gcc gdb + jq bear clang-tools rnix-lsp