mirror of
https://github.com/NixOS/nix
synced 2025-06-25 10:41:16 +02:00
Fix a few warnings
This commit is contained in:
parent
db7577a660
commit
c5fcb1bd50
6 changed files with 6 additions and 10 deletions
|
@ -2,7 +2,6 @@
|
||||||
///@file
|
///@file
|
||||||
|
|
||||||
#include "config.hh"
|
#include "config.hh"
|
||||||
#include "ref.hh"
|
|
||||||
#include "source-path.hh"
|
#include "source-path.hh"
|
||||||
|
|
||||||
namespace nix {
|
namespace nix {
|
||||||
|
|
|
@ -14,7 +14,7 @@ cxx = meson.get_compiler('cpp')
|
||||||
|
|
||||||
subdir('nix-meson-build-support/deps-lists')
|
subdir('nix-meson-build-support/deps-lists')
|
||||||
|
|
||||||
configdata = configuration_data()
|
configuration_data()
|
||||||
|
|
||||||
deps_private_maybe_subproject = [
|
deps_private_maybe_subproject = [
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
#include "file-system.hh"
|
|
||||||
#include "signals.hh"
|
|
||||||
#include "finally.hh"
|
|
||||||
#include "serialise.hh"
|
#include "serialise.hh"
|
||||||
#include "util.hh"
|
#include "util.hh"
|
||||||
|
|
||||||
|
|
|
@ -223,7 +223,7 @@ foreach linkname : nix_symlinks
|
||||||
# The 'runtime' tag is what executables default to, which we want to emulate here.
|
# The 'runtime' tag is what executables default to, which we want to emulate here.
|
||||||
install_tag : 'runtime'
|
install_tag : 'runtime'
|
||||||
)
|
)
|
||||||
t = custom_target(
|
custom_target(
|
||||||
command: ['ln', '-sf', fs.name(this_exe), '@OUTPUT@'],
|
command: ['ln', '-sf', fs.name(this_exe), '@OUTPUT@'],
|
||||||
output: linkname + executable_suffix,
|
output: linkname + executable_suffix,
|
||||||
# native doesn't allow dangling symlinks, but the target executable often doesn't exist at this time
|
# native doesn't allow dangling symlinks, but the target executable often doesn't exist at this time
|
||||||
|
|
|
@ -57,10 +57,10 @@ libdir = join_paths(prefix, get_option('libdir'))
|
||||||
|
|
||||||
# Required Programs
|
# Required Programs
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
xz = find_program('xz')
|
find_program('xz')
|
||||||
xsubpp = find_program('xsubpp')
|
xsubpp = find_program('xsubpp')
|
||||||
perl = find_program('perl')
|
perl = find_program('perl')
|
||||||
curl = find_program('curl')
|
find_program('curl')
|
||||||
yath = find_program('yath', required : false)
|
yath = find_program('yath', required : false)
|
||||||
|
|
||||||
# Required Libraries
|
# Required Libraries
|
||||||
|
@ -157,7 +157,7 @@ subdir(lib_dir)
|
||||||
if get_option('tests').enabled()
|
if get_option('tests').enabled()
|
||||||
yath_rc_conf = configuration_data()
|
yath_rc_conf = configuration_data()
|
||||||
yath_rc_conf.set('lib_dir', lib_dir)
|
yath_rc_conf.set('lib_dir', lib_dir)
|
||||||
yath_rc = configure_file(
|
configure_file(
|
||||||
output : '.yath.rc',
|
output : '.yath.rc',
|
||||||
input : '.yath.rc.in',
|
input : '.yath.rc.in',
|
||||||
configuration : yath_rc_conf,
|
configuration : yath_rc_conf,
|
||||||
|
|
|
@ -37,7 +37,7 @@ test_confdata = {
|
||||||
# Done as a subdir() so Meson places it under `common` in the build directory as well.
|
# Done as a subdir() so Meson places it under `common` in the build directory as well.
|
||||||
subdir('common')
|
subdir('common')
|
||||||
|
|
||||||
config_nix_in = configure_file(
|
configure_file(
|
||||||
input : 'config.nix.in',
|
input : 'config.nix.in',
|
||||||
output : 'config.nix',
|
output : 'config.nix',
|
||||||
configuration : test_confdata,
|
configuration : test_confdata,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue