runtime: memory-map: depend on patched nonoverlapping_interval_tree v…

…ia Cargo
immunant · Sep 6, 2023 · 0ce7e62 · 0ce7e62
1 parent c6d2916
commit 0ce7e62
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 476 deletions.
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
@@ -4,7 +4,7 @@ project(IA2Runtime)
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/release/libmemory_map.so
   COMMAND CARGO_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR} cargo build --manifest-path ${CMAKE_CURRENT_SOURCE_DIR}/memory-map/Cargo.toml --release
-  DEPENDS memory-map/Cargo.toml memory-map/src/lib.rs memory-map/src/disjoint_interval_tree.rs
+  DEPENDS memory-map/Cargo.toml memory-map/src/lib.rs
 )
 
 add_library(memory-map STATIC IMPORTED)

diff --git a/runtime/memory-map/Cargo.toml b/runtime/memory-map/Cargo.toml
@@ -7,6 +7,7 @@ crate_type = ["cdylib"]
 
 [dependencies]
 libc_alloc = "1.0.5"
+nonoverlapping_interval_tree = { git = "https://github.com/fw-immunant/non-overlapping-interval-tree.git", branch = "ia2", default_features = false }
 
 [profile.dev]
 panic = "abort"