[wimal] Use llvm tools instead of cctools

wimal-build · Nov 27, 2024 · 0a450f1 · 0a450f1
1 parent c8c4559
commit 0a450f1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/libuv/CMakeLists.txt b/libuv/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.10)
 project(libuv LANGUAGES C)
 
 cmake_policy(SET CMP0057 NEW) # Enable IN_LIST operator

diff --git a/wimal/install.cpp b/wimal/install.cpp
@@ -31,19 +31,21 @@ void Install::Run(const Context *context, std::vector<std::string> extraArgs) {
         {"llvm-ranlib", "ranlib"},
         {"llvm-readelf", "readelf"},
         {"llvm-strip", "strip"},
+        {"llvm-otool", "otool"},
     };
     static const std::vector<link> cctools = {
-        {"llvm-ar", "ar"},
-        {"apple-install-name-tool", "install_name_tool"},
-        {"apple-ld", "ld"},
-        {"apple-lipo", "lipo"},
-        {"apple-nm", "nm"},
-        {"llvm-ranlib", "ranlib"},
-        {"llvm-readelf", "readelf"},
-        {"apple-strip", "strip"},
         {"dsymutil", "dsymutil"},
+        {"lld", "ld"},
+        {"llvm-ar", "ar"},
+        {"llvm-install-name-tool", "install_name_tool"},
+        {"llvm-lipo", "lipo"},
+        {"llvm-nm", "nm"},
         {"llvm-objcopy", "objcopy"},
         {"llvm-objdump", "objdump"},
+        {"llvm-otool", "otool"},
+        {"llvm-ranlib", "ranlib"},
+        {"llvm-readelf", "readelf"},
+        {"llvm-strip", "strip"},
     };
     for (std::size_t i = 0; i < context->targets.size(); ++i) {
         auto &target = context->targets[i];

diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.4.4)
+cmake_minimum_required(VERSION 3.10)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)