Fix Building libmalloc

This commit is contained in:
Thomas A 2022-04-03 17:05:51 -07:00
parent de252b5b7a
commit 0e42ca3e7a
10 changed files with 9 additions and 9 deletions

View File

@ -1 +1 @@
../../../../../../../../../src/libmalloc/include/malloc/_malloc.h
../../../../../../../../../src/external/libmalloc/include/malloc/_malloc.h

View File

@ -1 +1 @@
../../../../../../../../../src/libmalloc/include/malloc/malloc.h
../../../../../../../../../src/external/libmalloc/include/malloc/malloc.h

View File

@ -1 +0,0 @@
../../../../../../../../../src/libmalloc/private/malloc_private.h

View File

@ -1 +1 @@
../../../../../../../../src/libmalloc/private/malloc_implementation.h
../../../../../../../../src/external/libmalloc/private/malloc_implementation.h

View File

@ -0,0 +1 @@
../../../../../../../../src/external/libmalloc/private/malloc_private.h

View File

@ -1 +1 @@
../../../../../../../../src/libmalloc/private/stack_logging.h
../../../../../../../../src/external/libmalloc/private/stack_logging.h

View File

@ -18,7 +18,7 @@ ln -sf "$BUILD/src/libremovefile/libremovefile.dylib" "$LIBS/system"
ln -sf "$BUILD/src/copyfile/libcopyfile.dylib" "$LIBS/system"
ln -sf "$BUILD/src/libsystem_coreservices/libsystem_coreservices.dylib" "$LIBS/system"
ln -sf "$BUILD/src/external/coretls/libsystem_coretls.dylib" "$LIBS/system"
ln -sf "$BUILD/src/libmalloc/libsystem_malloc.dylib" "$LIBS/system"
ln -sf "$BUILD/src/external/libmalloc/libsystem_malloc.dylib" "$LIBS/system"
ln -sf "$BUILD/src/libc/libsystem_c.dylib" "$LIBS/system"
ln -sf "$BUILD/src/kernel/libsystem_kernel.dylib" "$LIBS/system"
ln -sf "$BUILD/src/keymgr/libkeymgr.dylib" "$LIBS/system"

View File

@ -40,7 +40,7 @@ FUNCTION(use_ld64 target)
-Wl,-dylib_file,/usr/lib/libresolv.9.dylib:${CMAKE_BINARY_DIR}/src/libresolv/libresolv.9.dylib \
-Wl,-dylib_file,/usr/lib/system/libxpc.dylib:${CMAKE_BINARY_DIR}/src/external/libxpc/libxpc_firstpass.dylib \
-Wl,-dylib_file,/usr/lib/libc++.1.dylib:${CMAKE_BINARY_DIR}/src/external/libcxx/libc++.1.dylib \
-Wl,-dylib_file,/usr/lib/system/libsystem_malloc.dylib:${CMAKE_BINARY_DIR}/src/libmalloc/libsystem_malloc_firstpass.dylib \
-Wl,-dylib_file,/usr/lib/system/libsystem_malloc.dylib:${CMAKE_BINARY_DIR}/src/external/libmalloc/libsystem_malloc_firstpass.dylib \
-Wl,-dylib_file,/usr/lib/libobjc.A.dylib:${CMAKE_BINARY_DIR}/src/external/objc4/runtime/libobjc.A.dylib \
-Wl,-dylib_file,/usr/lib/libicucore.A.dylib:${CMAKE_BINARY_DIR}/src/external/icu/icuSources/libicucore.A.dylib \
-Wl,-dylib_file,/usr/lib/libncurses.5.4.dylib:${CMAKE_BINARY_DIR}/src/ncurses/ncurses/libncurses.5.4.dylib \

View File

@ -132,7 +132,7 @@ add_subdirectory(libgcc)
add_subdirectory(copyfile)
add_subdirectory(libinfo)
add_subdirectory(quarantine)
add_subdirectory(libmalloc)
add_subdirectory(external/libmalloc)
add_subdirectory(libunwind)
add_subdirectory(networkextension)
add_subdirectory(libsystem)

View File

@ -54,7 +54,7 @@ libsystem_reexport(
system_copyfile src/copyfile/libcopyfile.dylib
system_coreservices src/libsystem_coreservices/libsystem_coreservices.dylib
system_coretls src/external/coretls/libsystem_coretls.dylib
system_malloc src/libmalloc/libsystem_malloc.dylib
system_malloc src/external/libmalloc/libsystem_malloc.dylib
system_c src/libc/libsystem_c.dylib
system_kernel src/kernel/libsystem_kernel.dylib
system_trace src/external/libtrace/libsystem_trace.dylib