aboutsummaryrefslogtreecommitdiffstats
path: root/src/examples/Makefile
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2020-11-24 15:08:20 +0100
committerGustav Sörnäs <gustav@sornas.net>2020-11-24 15:08:20 +0100
commiteba74d74502641a4565dc6011db33742e8450680 (patch)
treef7785882d1084944b309bd777d4663112823070a /src/examples/Makefile
parent0960f519d9e1e3c108b1825a0ec241b1c56c5cca (diff)
downloadpintos-rs-eba74d74502641a4565dc6011db33742e8450680.tar.gz
move rust "libc" to separate crate and link with that instead
Diffstat (limited to 'src/examples/Makefile')
-rw-r--r--src/examples/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/examples/Makefile b/src/examples/Makefile
index dba72c9..dd777ae 100644
--- a/src/examples/Makefile
+++ b/src/examples/Makefile
@@ -3,18 +3,16 @@ SRCDIR = ..
# Test programs to compile, and a list of sources for each.
# To add a new test, put its name on the PROGS list
# and then add a name_SRC line that lists its source files.
-PROGS_C = cat cmp cp echo halt hex-dump ls mcat mcp mkdir pwd rm shell \
+PROGS = cat cmp cp echo halt hex-dump ls mcat mcp mkdir pwd rm shell \
bubsort insult lineup matmult recursor \
sumargv pfs pfs_reader pfs_writer dummy longrun \
child parent generic_parent longrun_interactive busy \
line_echo file_syscall_tests longrun_nowait shellcode \
crack overflow dir_stress create_file create_remove_file
-PROGS_RUST = rust
+PROGS_RS = haltrs
-PROGS = $(PROGS_C) $(PROGS_RUST)
-
-rust_SRC = rust.c
+haltrs_SRC = $(SRCDIR)/../halt-rs
# Added test programs
sumargv_SRC = sumargv.c