[libc++/libc++abi] Use Python3_EXECUTABLE consistently to run utilities
This commit is contained in:
parent
9968331a59
commit
1b2fa6e46e
|
@ -16,7 +16,6 @@ endif()
|
|||
# Detect if we are building in the same configuration used to generate
|
||||
# the abilist files.
|
||||
set(ABILIST_FILE "${CMAKE_CURRENT_LIST_DIR}/${GENERIC_TARGET_TRIPLE}.v${LIBCXX_ABI_VERSION}.abilist")
|
||||
set(SYMDIFF_EXE "${LIBCXX_SOURCE_DIR}/utils/sym_diff.py")
|
||||
if (EXISTS "${ABILIST_FILE}"
|
||||
AND TARGET cxx_shared
|
||||
AND ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi" OR
|
||||
|
@ -25,8 +24,10 @@ if (EXISTS "${ABILIST_FILE}"
|
|||
AND LIBCXX_ENABLE_EXCEPTIONS
|
||||
AND NOT LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS)
|
||||
add_custom_target(check-cxx-abilist
|
||||
${SYMDIFF_EXE} --only-stdlib-symbols --strict ${ABILIST_FILE}
|
||||
$<TARGET_SONAME_FILE:cxx_shared>
|
||||
${Python3_EXECUTABLE} "${LIBCXX_SOURCE_DIR}/utils/sym_diff.py"
|
||||
--only-stdlib-symbols
|
||||
--strict ${ABILIST_FILE}
|
||||
$<TARGET_SONAME_FILE:cxx_shared>
|
||||
DEPENDS cxx_shared
|
||||
COMMENT "Testing ABI compatibility...")
|
||||
else()
|
||||
|
|
|
@ -83,12 +83,12 @@ def is_mach_o(filename):
|
|||
with open(filename, 'rb') as f:
|
||||
magic_bytes = f.read(4)
|
||||
return magic_bytes in [
|
||||
'\xfe\xed\xfa\xce', # MH_MAGIC
|
||||
'\xce\xfa\xed\xfe', # MH_CIGAM
|
||||
'\xfe\xed\xfa\xcf', # MH_MAGIC_64
|
||||
'\xcf\xfa\xed\xfe', # MH_CIGAM_64
|
||||
'\xca\xfe\xba\xbe', # FAT_MAGIC
|
||||
'\xbe\xba\xfe\xca' # FAT_CIGAM
|
||||
b'\xfe\xed\xfa\xce', # MH_MAGIC
|
||||
b'\xce\xfa\xed\xfe', # MH_CIGAM
|
||||
b'\xfe\xed\xfa\xcf', # MH_MAGIC_64
|
||||
b'\xcf\xfa\xed\xfe', # MH_CIGAM_64
|
||||
b'\xca\xfe\xba\xbe', # FAT_MAGIC
|
||||
b'\xbe\xba\xfe\xca' # FAT_CIGAM
|
||||
]
|
||||
|
||||
|
||||
|
|
|
@ -285,7 +285,7 @@ if (LIBCXXABI_ENABLE_STATIC)
|
|||
# Merge the libc++abi.a and libunwind.a into one.
|
||||
if(LIBCXXABI_USE_LLVM_UNWINDER AND LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY)
|
||||
add_custom_command(TARGET cxxabi_static POST_BUILD
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${LIBCXXABI_LIBCXX_PATH}/utils/merge_archives.py
|
||||
COMMAND ${Python3_EXECUTABLE} ${LIBCXXABI_LIBCXX_PATH}/utils/merge_archives.py
|
||||
ARGS
|
||||
-o "$<TARGET_LINKER_FILE:cxxabi_static>"
|
||||
--ar "${CMAKE_AR}"
|
||||
|
|
Loading…
Reference in New Issue