Skip to content

Commit

Permalink
Use ldid2. Disable errors on warnings due to syscall() deprecation
Browse files Browse the repository at this point in the history
  • Loading branch information
coolstar committed Jan 11, 2018
1 parent 7c34c90 commit 7a9ddc9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ settings.add_setting_option('enable_ios_bootstrap', '--enable-ios-bootstrap', 'd
settings.add_setting_option('install_name', '--install-name', 'LC_ID_DYLIB',
lambda: ['/usr/local/lib/libsubstitute.0.dylib', '/usr/lib/libsubstitute.0.dylib'][settings.host_machine().is_ios()])

j_tool = mconfig.CLITool('jtool', ['jtool'], 'JTOOL', settings.host_machine(), settings.host_machine().toolchains())
j_tool.optional_nocheck()
ldid_tool = mconfig.CLITool('ldid', ['ldid'], 'LDID', settings.host_machine(), settings.host_machine().toolchains())
ldid_tool.optional_nocheck()

asm_archs = [
('x86_64', []),
Expand Down Expand Up @@ -60,7 +60,7 @@ if settings.enable_ios_bootstrap:

if settings.enable_werror:
for mach in machs + [settings.host_machine()]:
settings[mach.name].cflags = ['-Werror'] + settings[mach.name].cflags
settings[mach.name].cflags = ['-Wno-error'] + settings[mach.name].cflags

# XXX this is a mess and wrong
flags = ['-O3']
Expand All @@ -75,7 +75,7 @@ settings.host.ldflags = ['-dead_strip'] + settings.host.ldflags
cc_argv = c.cc.argv()
if 'armv7' in cc_argv or 'arm64' in cc_argv:
settings.modify_link = lambda env: (
env['cmds'].append(j_tool.argv() + ['--sign', '--inplace', '--ent', settings.src+'/ent.plist', env['outs'][0]]),
env['cmds'].append(ldid_tool.argv() + ['-S'+settings.src+'/ent.plist', env['outs'][0]]),
env['ins'].append(settings.src+'/ent.plist')
)

Expand Down

0 comments on commit 7a9ddc9

Please sign in to comment.