From 40c8645ed3fb5fc3cc5a70c45c88feeb24991e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rubens=20Brand=C3=A3o?= Date: Wed, 7 Feb 2024 11:36:36 -0300 Subject: [PATCH] Fix libafl_qemu libqasan Makefile (#1835) * fix libafl_qemu libqasan Makefile * remove make clean from libafl_qemu libqasan build --------- Co-authored-by: Andrea Fioraldi --- libafl_qemu/build_linux.rs | 10 ---------- libafl_qemu/libqasan/Makefile | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/libafl_qemu/build_linux.rs b/libafl_qemu/build_linux.rs index 7ba941bfd8..f6dcbd0b60 100644 --- a/libafl_qemu/build_linux.rs +++ b/libafl_qemu/build_linux.rs @@ -72,16 +72,6 @@ pub fn build() { let qasan_dir = fs::canonicalize(qasan_dir).unwrap(); println!("cargo:rerun-if-changed={}", qasan_dir.display()); - assert!(Command::new("make") - .current_dir(out_dir_path) - .env("CC", &cross_cc) - .env("OUT_DIR", &target_dir) - .arg("-C") - .arg(&qasan_dir) - .arg("clean") - .status() - .expect("make failed") - .success()); let mut make = Command::new("make"); if cfg!(debug_assertions) { make.env("CFLAGS", "-DDEBUG=1"); diff --git a/libafl_qemu/libqasan/Makefile b/libafl_qemu/libqasan/Makefile index 858cb49aa2..1044994f7c 100644 --- a/libafl_qemu/libqasan/Makefile +++ b/libafl_qemu/libqasan/Makefile @@ -21,13 +21,13 @@ override LDFLAGS += -ldl -pthread SRC := libqasan.c hooks.c malloc.c string.c uninstrument.c patch.c dlmalloc.c printf/printf.c HDR := libqasan.h qasan.h map_macro.h printf/printf.h -all: libqasan.so +all: $(OUT_DIR)/libqasan.so -libqasan.so: $(HDR) $(SRC) - $(CC) $(CFLAGS) -fPIC -shared $(SRC) -o $(OUT_DIR)/$@ $(LDFLAGS) +$(OUT_DIR)/libqasan.so: $(HDR) $(SRC) + $(CC) $(CFLAGS) -fPIC -shared $(SRC) -o $@ $(LDFLAGS) .NOTPARALLEL: clean clean: rm -f *.o *.so *~ a.out core core.[1-9][0-9]* - rm -f libqasan.so + rm -f $(OUT_DIR)/libqasan.so