Skip to content

Commit

Permalink
meson: Move to the new mkdevkit.py option encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
oleavr committed Apr 10, 2024
1 parent 4feef30 commit 2060e32
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -517,28 +517,29 @@ if get_option('devkits').length() != 0
mkdevkit = find_program('./releng/mkdevkit.py')
uninstalled_dir = meson.global_build_root() / 'meson-uninstalled'
devkit_options = [
'--cc=' + '!'.join(cc.cmd_array()),
'--c-args=' + '!'.join(get_option('c_args')),
'--pkg-config-path=' + '!'.join([uninstalled_dir] + get_option('pkg_config_path')),
'--cc', '>>>', cc.cmd_array(), '<<<',
'--c-args', '>>>', get_option('c_args'), '<<<',
'--pkg-config', '>>>', find_program('pkg-config'), '<<<',
'--pkg-config-path', '>>>', uninstalled_dir, get_option('pkg_config_path'), '<<<',
]
if host_toolchain == 'microsoft'
static_lib_prefix = ''
static_lib_suffix = '.lib'
devkit_options += ['--lib=' + lib.full_path()]
devkit_options += ['--lib', '>>>', lib, '<<<']
else
static_lib_prefix = 'lib'
static_lib_suffix = '.a'
devkit_options += [
'--ar=' + ar.full_path(),
'--nm=' + nm.full_path(),
'--ar', '>>>', ar, '<<<',
'--nm', '>>>', nm, '<<<',
]
objcopy = find_program('objcopy', required: false)
if objcopy.found()
devkit_options += '--objcopy=' + objcopy.full_path()
devkit_options += ['--objcopy', '>>>', objcopy, '<<<']
endif
endif
if host_os_family == 'darwin'
devkit_options += ['--libtool=' + libtool.full_path()]
devkit_options += ['--libtool', '>>>', libtool, '<<<']
endif
endif

Expand Down

0 comments on commit 2060e32

Please sign in to comment.