From 63aab0f752ba1d40a1c4de6988a78cd1e6dcc1c7 Mon Sep 17 00:00:00 2001
From: hyper <25216562+mellow-hype@users.noreply.github.com>
Date: Mon, 20 Nov 2023 02:01:03 -0800
Subject: [PATCH] Fix: Unicorn build paths in top-level Makefile and Rust
 bindings' build.rs (#23)

* fix warnings: global re-export

* use the same unicorn build output dir in Makefile and bindings/rust/build.rs
---
 Makefile                 | 4 ++--
 bindings/rust/src/lib.rs | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6ebb458b..42e9a325 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ build:
 
 unicorn/build/libunicorn-common.a:
 	git submodule update --init --recursive
-	cmake -S unicorn/ -B unicorn/build -D BUILD_SHARED_LIBS=no
-	$(MAKE) -C ./unicorn/build -j8
+	cmake -S unicorn/ -B build/unicorn -D BUILD_SHARED_LIBS=no
+	$(MAKE) -C ./build/unicorn -j8
 
 build/libunicornafl: build unicorn/build/libunicorn-common.a
 	cd ./build && cmake .. -D BUILD_SHARED_LIBS=no
diff --git a/bindings/rust/src/lib.rs b/bindings/rust/src/lib.rs
index 0480f107..3b3c62a9 100644
--- a/bindings/rust/src/lib.rs
+++ b/bindings/rust/src/lib.rs
@@ -54,7 +54,6 @@ use alloc::{boxed::Box, rc::Rc, vec::Vec};
 use core::{cell::UnsafeCell, ptr};
 use ffi::uc_handle;
 use libc::c_void;
-use unicorn_const::{uc_error, Arch, HookType, MemRegion, MemType, Mode, Permission, Query};
 
 #[derive(Debug)]
 pub struct Context {