musl: fix install of syscall.h and alltypes.h
This commit is contained in:
parent
64ec36b51a
commit
b3fa8f77d8
2 changed files with 13 additions and 6 deletions
|
@ -7,7 +7,9 @@ alltypes_h = custom_target(
|
||||||
meson.project_source_root() + '/include/alltypes.h.in'
|
meson.project_source_root() + '/include/alltypes.h.in'
|
||||||
],
|
],
|
||||||
command : ['sed', '-f', '@INPUT0@', '@INPUT1@', '@INPUT2@'],
|
command : ['sed', '-f', '@INPUT0@', '@INPUT1@', '@INPUT2@'],
|
||||||
capture : true
|
capture : true,
|
||||||
|
install : true,
|
||||||
|
install_dir : 'include/bits/'
|
||||||
)
|
)
|
||||||
|
|
||||||
syscall_h_in = custom_target(
|
syscall_h_in = custom_target(
|
||||||
|
@ -23,6 +25,8 @@ syscall_h = custom_target(
|
||||||
output : 'syscall.h',
|
output : 'syscall.h',
|
||||||
input : [ meson.project_source_root() + '/arch/'+arch+'/bits/syscall.h.in', syscall_h_in ],
|
input : [ meson.project_source_root() + '/arch/'+arch+'/bits/syscall.h.in', syscall_h_in ],
|
||||||
command : ['cat', '@INPUT0@', '@INPUT1@'],
|
command : ['cat', '@INPUT0@', '@INPUT1@'],
|
||||||
capture : true
|
capture : true,
|
||||||
|
install : true,
|
||||||
|
install_dir : 'include/bits/'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,10 @@ cmd = cc.cmd_array()
|
||||||
cmd += '--print-libgcc-file-name'
|
cmd += '--print-libgcc-file-name'
|
||||||
libgcc = run_command(cmd)
|
libgcc = run_command(cmd)
|
||||||
libgcc = libgcc.stdout().strip()
|
libgcc = libgcc.stdout().strip()
|
||||||
|
|
||||||
|
arch = target_machine.cpu()
|
||||||
|
|
||||||
|
|
||||||
message('libgcc: ', libgcc)
|
message('libgcc: ', libgcc)
|
||||||
|
|
||||||
globbed_sources = run_command(meson.project_source_root() + '/glob.sh', target_machine.cpu_family())
|
globbed_sources = run_command(meson.project_source_root() + '/glob.sh', target_machine.cpu_family())
|
||||||
|
@ -12,10 +16,9 @@ newline= '''
|
||||||
'''
|
'''
|
||||||
globbed_sources = globbed_sources.stdout().strip().split(newline)
|
globbed_sources = globbed_sources.stdout().strip().split(newline)
|
||||||
|
|
||||||
|
|
||||||
globbed_headers = run_command(meson.project_source_root() + '/globbits.sh', target_machine.cpu_family())
|
globbed_headers = run_command(meson.project_source_root() + '/globbits.sh', target_machine.cpu_family())
|
||||||
|
|
||||||
newline= '''
|
|
||||||
'''
|
|
||||||
globbed_headers = globbed_headers.stdout().strip().split(newline)
|
globbed_headers = globbed_headers.stdout().strip().split(newline)
|
||||||
|
|
||||||
install_headers(globbed_headers, subdir: 'bits')
|
install_headers(globbed_headers, subdir: 'bits')
|
||||||
|
@ -47,6 +50,8 @@ install_headers(
|
||||||
subdir: 'netinet'
|
subdir: 'netinet'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
subdir('bits/')
|
||||||
|
|
||||||
message(globbed_headers)
|
message(globbed_headers)
|
||||||
|
|
||||||
c_args = [
|
c_args = [
|
||||||
|
@ -69,7 +74,6 @@ ld_args = [
|
||||||
libgcc
|
libgcc
|
||||||
]
|
]
|
||||||
|
|
||||||
arch = target_machine.cpu()
|
|
||||||
|
|
||||||
inc_dir_flags = [
|
inc_dir_flags = [
|
||||||
'-I'+meson.project_source_root()+'/arch/' + arch,
|
'-I'+meson.project_source_root()+'/arch/' + arch,
|
||||||
|
@ -88,7 +92,6 @@ inc_dirs = include_directories(
|
||||||
'include'
|
'include'
|
||||||
)
|
)
|
||||||
|
|
||||||
subdir('bits/')
|
|
||||||
|
|
||||||
ldso_sources = [
|
ldso_sources = [
|
||||||
'ldso/dlstart.c',
|
'ldso/dlstart.c',
|
||||||
|
|
Loading…
Reference in a new issue