Ything-RepoMirrors/PureDarwin
1
0
Fork 0
mirror of https://github.com/PureDarwin/PureDarwin.git synced 2026-01-25 04:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename "*.host" tools to "host_*" for consistency

Browse Source
This commit is contained in:
William Kent
2023-10-03 16:18:37 -04:00
parent b8a7e33cf5
commit 7f270a577b
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Kernel/xnu/CMakeLists.txt
View File

@@ -10,8 +10,8 @@ externalproject_add(xnu_headers.extproj
-D XNU_SRC=${CMAKE_CURRENT_SOURCE_DIR}
-D XNU_OBJ=<BINARY_DIR>
-D CODESIGN_ALLOCATE_PATH=$<TARGET_FILE:darwin_codesign_allocate>
-D CTFCONVERT_PATH=$<TARGET_FILE:ctfconvert.host>
-D CTFMERGE_PATH=$<TARGET_FILE:ctfmerge.host>
-D CTFCONVERT_PATH=$<TARGET_FILE:host_ctfconvert>
-D CTFMERGE_PATH=$<TARGET_FILE:host_ctfmerge>
-D CTFINSERT_PATH=$<TARGET_FILE:host_ctf_insert>
-D AVAILABILITY_PL_PATH=$<TARGET_FILE:availability.pl>
-D MIG_PATH=${PUREDARWIN_SOURCE_DIR}/tools/mig/mig.sh
@@ -35,7 +35,7 @@ externalproject_add(xnu_headers.extproj
)
add_dependencies(xnu_headers.extproj darwin_codesign_allocate
migcom host_strip host_lipo host_nm unifdef host_nmedit
ctfconvert.host ctfmerge.host availability.pl)
host_ctfconvert host_ctfmerge availability.pl)
add_library(xnu_headers INTERFACE)
add_dependencies(xnu_headers xnu_headers.extproj)
@@ -73,8 +73,8 @@ externalproject_add(xnu
-D XNU_SRC=${CMAKE_CURRENT_SOURCE_DIR}
-D XNU_OBJ=<BINARY_DIR>
-D CODESIGN_ALLOCATE_PATH=$<TARGET_FILE:darwin_codesign_allocate>
-D CTFCONVERT_PATH=$<TARGET_FILE:ctfconvert.host>
-D CTFMERGE_PATH=$<TARGET_FILE:ctfmerge.host>
-D CTFCONVERT_PATH=$<TARGET_FILE:host_ctfconvert>
-D CTFMERGE_PATH=$<TARGET_FILE:host_ctfmerge>
-D CTFINSERT_PATH=$<TARGET_FILE:host_ctf_insert>
-D AVAILABILITY_PL_PATH=$<TARGET_FILE:availability.pl>
-D LD_PATH=$<TARGET_FILE:darwin_ld>
@@ -100,7 +100,7 @@ externalproject_add(xnu
USES_TERMINAL_CONFIGURE TRUE
USES_TERMINAL_BUILD TRUE
)
add_dependencies(xnu xnu_headers libfirehose_kernel darwin_codesign_allocate ctfconvert.host ctfmerge.host migcom host_strip host_lipo host_nm unifdef host_nmedit availability.pl darwin_ld)
add_dependencies(xnu xnu_headers libfirehose_kernel darwin_codesign_allocate host_ctfconvert host_ctfmerge migcom host_strip host_lipo host_nm unifdef host_nmedit availability.pl darwin_ld)
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xnu/System/Library/Frameworks/Kernel.framework/Versions/A/Resources DESTINATION System/Library/Frameworks/Kernel.framework/Versions/A COMPONENT BaseSystem)
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xnu/System/Library/Frameworks/Kernel.framework/Versions/A/Headers DESTINATION System/Library/Frameworks/Kernel.framework/Versions/A COMPONENT DeveloperTools)

33
tools/dtrace_ctf/tools/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
find_package(ZLIB REQUIRED)
add_executable(ctfconvert.host)
target_sources(ctfconvert.host PRIVATE
add_executable(host_ctfconvert)
target_sources(host_ctfconvert PRIVATE
alist.cpp
array.c
atom.cpp
@@ -26,12 +26,13 @@ target_sources(ctfconvert.host PRIVATE
util.c
)
target_include_directories(ctfconvert.host PRIVATE ../include ../include/sys ../libelf)
target_link_libraries(ctfconvert.host PRIVATE libelf.host libdwarf.host libctf.host ${ZLIB_LIBRARY_RELEASE})
set_property(TARGET ctfconvert.host PROPERTY CXX_STANDARD 14)
set_property(TARGET host_ctfconvert PROPERTY OUTPUT_NAME "ctfconvert")
target_include_directories(host_ctfconvert PRIVATE ../include ../include/sys ../libelf)
target_link_libraries(host_ctfconvert PRIVATE libelf.host libdwarf.host libctf.host ${ZLIB_LIBRARY_RELEASE})
set_property(TARGET host_ctfconvert PROPERTY CXX_STANDARD 14)
add_executable(ctfdump.host)
target_sources(ctfdump.host PRIVATE
add_executable(host_ctfdump)
target_sources(host_ctfdump PRIVATE
alist.cpp
array.c
atom.cpp
@@ -54,12 +55,13 @@ target_sources(ctfdump.host PRIVATE
utils.c
)
target_include_directories(ctfdump.host PRIVATE ../include ../include/sys ../libelf)
target_link_libraries(ctfdump.host PRIVATE libelf.host libctf.host ${ZLIB_LIBRARY_RELEASE})
set_property(TARGET ctfdump.host PROPERTY CXX_STANDARD 14)
set_property(TARGET host_ctfdump PROPERTY OUTPUT_NAME "ctfdump")
target_include_directories(host_ctfdump PRIVATE ../include ../include/sys ../libelf)
target_link_libraries(host_ctfdump PRIVATE libelf.host libctf.host ${ZLIB_LIBRARY_RELEASE})
set_property(TARGET host_ctfdump PROPERTY CXX_STANDARD 14)
add_executable(ctfmerge.host)
target_sources(ctfmerge.host PRIVATE
add_executable(host_ctfmerge)
target_sources(host_ctfmerge PRIVATE
alist.cpp
array.c
atom.cpp
@@ -85,6 +87,7 @@ target_sources(ctfmerge.host PRIVATE
utils.c
)
target_include_directories(ctfmerge.host PRIVATE ../include ../include/sys ../libelf)
target_link_libraries(ctfmerge.host PRIVATE libelf.host libdwarf.host libctf.host ${ZLIB_LIBRARY_RELEASE})
set_property(TARGET ctfmerge.host PROPERTY CXX_STANDARD 14)
set_property(TARGET host_ctfmerge PROPERTY OUTPUT_NAME ctfmerge)
target_include_directories(host_ctfmerge PRIVATE ../include ../include/sys ../libelf)
target_link_libraries(host_ctfmerge PRIVATE libelf.host libdwarf.host libctf.host ${ZLIB_LIBRARY_RELEASE})
set_property(TARGET host_ctfmerge PROPERTY CXX_STANDARD 14)