Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Unicorn build paths in top-level Makefile and Rust bindings' build.rs #23

Merged
merged 2 commits into from
Nov 20, 2023
Merged

Fix: Unicorn build paths in top-level Makefile and Rust bindings' build.rs #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4f6ea9
fix warnings: global re-export
mellow-hype Nov 11, 2023
483638a
use the same unicorn build output dir in Makefile and bindings/rust/b…
mellow-hype Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion bindings/rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading