darlinghq · CuriousTommy · Feb 20, 2023 · Feb 20, 2023 · Feb 20, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -441,3 +441,6 @@
 [submodule "src/external/netcat"]
 	path = src/external/netcat
 	url = ../darling-netcat.git
+[submodule "src/external/removefile"]
+	path = src/external/removefile
+	url = ../darling-removefile.git
diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/checkint.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/checkint.h
@@ -1 +1 @@
-../../../../../../../../src/libremovefile/checkint.h
+../../../../../../../../src/external/removefile/darling/include/checkint.h
diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/removefile.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/removefile.h
@@ -1 +1 @@
-../../../../../../../../src/libremovefile/removefile.h
+../../../../../../../../src/external/removefile/darling/include/removefile.h
diff --git a/cmake/use_ld64.cmake b/cmake/use_ld64.cmake
@@ -20,7 +20,7 @@ FUNCTION(use_ld64 target)
 -Wl,-dylib_file,/usr/lib/system/liblaunch.dylib:${CMAKE_BINARY_DIR}/src/launchd/liblaunch/liblaunch_firstpass.dylib \
 -Wl,-dylib_file,/usr/lib/system/libkeymgr.dylib:${CMAKE_BINARY_DIR}/src/external/keymgr/libkeymgr_firstpass.dylib \
 -Wl,-dylib_file,/usr/lib/system/libquarantine.dylib:${CMAKE_BINARY_DIR}/src/quarantine/libquarantine.dylib \
--Wl,-dylib_file,/usr/lib/system/libremovefile.dylib:${CMAKE_BINARY_DIR}/src/libremovefile/libremovefile.dylib \
+-Wl,-dylib_file,/usr/lib/system/libremovefile.dylib:${CMAKE_BINARY_DIR}/src/external/removefile/libremovefile.dylib \
 -Wl,-dylib_file,/usr/lib/system/libcopyfile.dylib:${CMAKE_BINARY_DIR}/src/external/copyfile/libcopyfile.dylib \
 -Wl,-dylib_file,/usr/lib/system/libsystem_coreservices.dylib:${CMAKE_BINARY_DIR}/src/libsystem_coreservices/libsystem_coreservices.dylib \
 -Wl,-dylib_file,/usr/lib/system/libsystem_notify.dylib:${CMAKE_BINARY_DIR}/src/external/libnotify/libsystem_notify_firstpass.dylib \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -148,7 +148,7 @@ add_subdirectory(external/libsystem)
 add_subdirectory(libsystem_coreservices)
 add_subdirectory(external/libutil)
 add_subdirectory(external/libnotify)
-add_subdirectory(libremovefile)
+add_subdirectory(external/removefile)
 add_subdirectory(launchd)
 add_subdirectory(external/keymgr)
 add_subdirectory(libcache)

diff --git a/src/external/libsystem b/src/external/libsystem
diff --git a/src/external/removefile b/src/external/removefile
diff --git a/src/libremovefile/CMakeLists.txt b/src/libremovefile/CMakeLists.txt
diff --git a/src/libremovefile/LICENSE b/src/libremovefile/LICENSE
diff --git a/src/libremovefile/checkint.3 b/src/libremovefile/checkint.3
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../../../../../../../src/libremovefile/checkint.h
		../../../../../../../../src/external/removefile/darling/include/checkint.h