diff --git a/nemu/Makefile b/nemu/Makefile index 55d36f1..c7d3d80 100644 --- a/nemu/Makefile +++ b/nemu/Makefile @@ -93,6 +93,5 @@ integration-tests: $(IMAGES) test $$r -eq 0 test: unit-tests integration-tests - @$(OBJ_DIR)/tests/expr_test -.PHONY: test integration-tests unit-tests \ No newline at end of file +.PHONY: test unit-tests integration-tests \ No newline at end of file diff --git a/nemu/default.nix b/nemu/default.nix index e97588e..53765d6 100644 --- a/nemu/default.nix +++ b/nemu/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = with pkgs; [ gnumake + pkg-config flex bison ]; buildInputs = with pkgs; [ - check readline libllvm ]; diff --git a/nemu/tests/Makefile b/nemu/tests/Makefile index 6804b41..2e8c784 100644 --- a/nemu/tests/Makefile +++ b/nemu/tests/Makefile @@ -7,3 +7,4 @@ $(OBJ_DIR)/%: %.c $(TEST_OBJS) app @$(CC) $(CFLAGS) -o $@.o -c $< @echo + LD $@ @$(LD) $(LIBS) $(LDFLAGS) -o $@ $(TEST_OBJS) $@.o + @$@ diff --git a/result b/result index 88d0079..172ba27 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/g0h98bppypvyz3z4sv45kl9218ad2gsq-nemu-2024-03-02 \ No newline at end of file +/nix/store/d0jlcjdrgsb5pis8flyy5ihifdnfhms5-am-kernels-riscv32-none-elf-2024.02.18 \ No newline at end of file