diff --git a/libcxx/utils/libcxx/sym_check/extract.py b/libcxx/utils/libcxx/sym_check/extract.py --- a/libcxx/utils/libcxx/sym_check/extract.py +++ b/libcxx/utils/libcxx/sym_check/extract.py @@ -9,10 +9,10 @@ """ extract - A set of function that extract symbol lists from shared libraries. """ -import distutils.spawn import os.path from os import environ import re +import shutil import subprocess import sys @@ -30,7 +30,7 @@ """ Search for the nm executable and return the path. """ - return distutils.spawn.find_executable('nm') + return shutil.which('nm') def __init__(self, static_lib): """ @@ -119,7 +119,7 @@ """ Search for the readelf executable and return the path. """ - return distutils.spawn.find_executable('readelf') + return shutil.which('readelf') def __init__(self, static_lib): """ @@ -200,7 +200,7 @@ """ Search for the dump executable and return the path. """ - return distutils.spawn.find_executable('dump') + return shutil.which('dump') def __init__(self, static_lib): """ diff --git a/libcxx/utils/libcxx/sym_check/util.py b/libcxx/utils/libcxx/sym_check/util.py --- a/libcxx/utils/libcxx/sym_check/util.py +++ b/libcxx/utils/libcxx/sym_check/util.py @@ -8,8 +8,8 @@ from pprint import pformat import ast -import distutils.spawn import re +import shutil import subprocess import sys @@ -60,7 +60,7 @@ f.write(out_str) -_cppfilt_exe = distutils.spawn.find_executable('c++filt') +_cppfilt_exe = shutil.which('c++filt') def demangle_symbol(symbol):