Remove special casing for libiconv.
This commit is contained in:
parent
150345f2a6
commit
e7ff2ff2ac
4
dist/macdeploy.py
vendored
4
dist/macdeploy.py
vendored
@ -178,8 +178,6 @@ def GetBrokenLibraries(binary):
|
|||||||
continue
|
continue
|
||||||
if os.path.basename(binary) in line:
|
if os.path.basename(binary) in line:
|
||||||
continue
|
continue
|
||||||
if 'libiconv' in line:
|
|
||||||
broken_libs['libs'].append(line)
|
|
||||||
elif re.match(r'^\s*/System/', line):
|
elif re.match(r'^\s*/System/', line):
|
||||||
continue # System framework
|
continue # System framework
|
||||||
elif re.match(r'^\s*/usr/lib/', line):
|
elif re.match(r'^\s*/usr/lib/', line):
|
||||||
@ -327,8 +325,6 @@ def FixInstallPath(library_path, library, new_path):
|
|||||||
commands.append(args)
|
commands.append(args)
|
||||||
|
|
||||||
def FindSystemLibrary(library_name):
|
def FindSystemLibrary(library_name):
|
||||||
if 'iconv' in library_name:
|
|
||||||
return None
|
|
||||||
for path in ['/lib', '/usr/lib']:
|
for path in ['/lib', '/usr/lib']:
|
||||||
full_path = os.path.join(path, library_name)
|
full_path = os.path.join(path, library_name)
|
||||||
if os.path.exists(full_path):
|
if os.path.exists(full_path):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user