mirror of
https://github.com/NixOS/nix.git
synced 2025-11-18 00:12:43 +01:00
Rename file to avoid reserved name
This commit is contained in:
parent
79e0ef88bf
commit
6a0582d9fd
59 changed files with 95 additions and 95 deletions
1
src/libstore/build-utils-meson
Symbolic link
1
src/libstore/build-utils-meson
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
../../build-utils-meson
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../meson-utils
|
||||
|
|
@ -14,7 +14,7 @@ project('nix-store', 'cpp',
|
|||
|
||||
cxx = meson.get_compiler('cpp')
|
||||
|
||||
subdir('meson-utils/deps-lists')
|
||||
subdir('build-utils-meson/deps-lists')
|
||||
|
||||
configdata = configuration_data()
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ deps_private_maybe_subproject = [
|
|||
deps_public_maybe_subproject = [
|
||||
dependency('nix-util'),
|
||||
]
|
||||
subdir('meson-utils/subprojects')
|
||||
subdir('build-utils-meson/subprojects')
|
||||
|
||||
run_command('ln', '-s',
|
||||
meson.project_build_root() / '__nothing_link_target',
|
||||
|
|
@ -67,7 +67,7 @@ has_acl_support = cxx.has_header('sys/xattr.h') \
|
|||
and cxx.has_function('lremovexattr')
|
||||
configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int())
|
||||
|
||||
subdir('meson-utils/threads')
|
||||
subdir('build-utils-meson/threads')
|
||||
|
||||
boost = dependency(
|
||||
'boost',
|
||||
|
|
@ -153,7 +153,7 @@ add_project_arguments(
|
|||
language : 'cpp',
|
||||
)
|
||||
|
||||
subdir('meson-utils/diagnostics')
|
||||
subdir('build-utils-meson/diagnostics')
|
||||
|
||||
sources = files(
|
||||
'binary-cache-store.cc',
|
||||
|
|
@ -385,7 +385,7 @@ foreach name, value : cpp_str_defines
|
|||
]
|
||||
endforeach
|
||||
|
||||
subdir('meson-utils/export-all-symbols')
|
||||
subdir('build-utils-meson/export-all-symbols')
|
||||
|
||||
this_library = library(
|
||||
'nixstore',
|
||||
|
|
@ -402,4 +402,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
|
|||
|
||||
libraries_private = []
|
||||
|
||||
subdir('meson-utils/export')
|
||||
subdir('build-utils-meson/export')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue