From 1a8bf6745219934dbb3eab4a3af568a8f5a9c124 Mon Sep 17 00:00:00 2001 From: superp00t Date: Wed, 4 Sep 2024 09:15:08 -0400 Subject: [PATCH] chore(build): remove mem dependency, use bc for allocation behavior now --- .gitmodules | 3 --- build.zig | 3 --- build.zig.zon | 9 ++------- lib/CMakeLists.txt | 1 - lib/mem | 1 - storm/CMakeLists.txt | 3 +-- 6 files changed, 3 insertions(+), 17 deletions(-) delete mode 160000 lib/mem diff --git a/.gitmodules b/.gitmodules index 358b1e4..c0a36d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "lib/system"] path = lib/system url = https://github.com/thunderbrewhq/system.git -[submodule "lib/mem"] - path = lib/mem - url = https://github.com/thunderbrewhq/mem.git [submodule "lib/bc"] path = lib/bc url = https://github.com/thunderbrewhq/bc.git diff --git a/build.zig b/build.zig index 449ccf2..ed2162d 100644 --- a/build.zig +++ b/build.zig @@ -19,10 +19,7 @@ pub fn build(b: *std.Build) void { system.add_defines(storm); // Get dependencies - const mem = b.dependency("mem", .{}); const bc = b.dependency("bc", .{}); - // Publicly link mem - storm.linkLibrary(mem.artifact("mem")); // Link bc storm.linkLibrary(bc.artifact("bc")); diff --git a/build.zig.zon b/build.zig.zon index 8b9a250..64f438a 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -9,11 +9,6 @@ }, .bc = .{ .url = "https://github.com/thunderbrewhq/bc/archive/refs/heads/master.zip", - .hash = "1220ef571af35d366e093fb7ad65b0ac65dcde291d5bbbd1d2cf42b0b1d59612fa0a", - }, - .mem = .{ - .url = "https://github.com/thunderbrewhq/mem/archive/refs/heads/master.zip", - .hash = "12205739d6afa86c264dde5ff94fdf7f14df68122054ce899934faf972d0b11d7ac5", - }, - }, + .hash = "1220c4c7888fb860cbe0297b9b525dab4ac6ae7b8b9b6b984147124b884c71ff8bf0", + }, }, } diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 491f736..9bf5c17 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,3 +1,2 @@ add_subdirectory(system) -add_subdirectory(mem) add_subdirectory(bc) diff --git a/lib/mem b/lib/mem deleted file mode 160000 index 5153788..0000000 --- a/lib/mem +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 515378839ec59155ef2b8df141f588f3f12f89d2 diff --git a/storm/CMakeLists.txt b/storm/CMakeLists.txt index 1c63451..0237a10 100644 --- a/storm/CMakeLists.txt +++ b/storm/CMakeLists.txt @@ -52,10 +52,9 @@ target_include_directories(storm target_link_libraries(storm PUBLIC - mem + bc PRIVATE system - bc ) if(HAS_NO_INVALID_OFFSETOF)