chore(3p/nix): Always enable the garbage collector
It's unclear why this toggle existed, now it doesn't.
This commit is contained in:
parent
168ef124ef
commit
e797b4d09b
4 changed files with 10 additions and 64 deletions
26
third_party/nix/corepkgs/meson.build
vendored
26
third_party/nix/corepkgs/meson.build
vendored
|
@ -1,13 +1,3 @@
|
|||
# Nix corepkgs build file
|
||||
#============================================================================
|
||||
|
||||
|
||||
|
||||
|
||||
# src files
|
||||
#============================================================================
|
||||
|
||||
|
||||
corepkgs_data = files(
|
||||
join_paths(meson.source_root(), 'corepkgs/buildenv.nix'),
|
||||
join_paths(meson.source_root(), 'corepkgs/derivation.nix'),
|
||||
|
@ -15,14 +5,6 @@ corepkgs_data = files(
|
|||
join_paths(meson.source_root(), 'corepkgs/imported-drv-to-derivation.nix'),
|
||||
join_paths(meson.source_root(), 'corepkgs/unpack-channel.nix'))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# targets
|
||||
#============================================================================
|
||||
|
||||
|
||||
config_nix = configuration_data()
|
||||
config_nix.set('bash', bash.path())
|
||||
config_nix.set('coreutils', coreutils)
|
||||
|
@ -39,14 +21,6 @@ config_nix.set('localstatedir', localstatedir)
|
|||
config_nix.set('sysconfdir', sysconfdir)
|
||||
config_nix.set('storedir', nixstoredir)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# build
|
||||
#============================================================================
|
||||
|
||||
|
||||
corepkgs_data += configure_file(
|
||||
input : 'config.nix.in',
|
||||
output : 'config.nix',
|
||||
|
|
46
third_party/nix/meson.build
vendored
46
third_party/nix/meson.build
vendored
|
@ -1,15 +1,3 @@
|
|||
# Nix project build file
|
||||
#============================================================================
|
||||
|
||||
|
||||
|
||||
|
||||
# init
|
||||
#============================================================================
|
||||
|
||||
|
||||
# init project
|
||||
#-------------------------------------------------
|
||||
project(
|
||||
'nix',
|
||||
'cpp',
|
||||
|
@ -25,21 +13,14 @@ project(
|
|||
)
|
||||
|
||||
# init compiler
|
||||
#-------------------------------------------------
|
||||
cpp = meson.get_compiler('cpp')
|
||||
|
||||
add_project_arguments(get_option('cxxflags'), language : 'cpp')
|
||||
add_project_link_arguments(get_option('ldflags'), language: 'cpp')
|
||||
|
||||
|
||||
cmake = import('cmake')
|
||||
pkg = import('pkgconfig')
|
||||
|
||||
|
||||
|
||||
|
||||
# init configuration
|
||||
#-------------------------------------------------
|
||||
config_h = configuration_data()
|
||||
|
||||
config_h.set(
|
||||
|
@ -77,12 +58,7 @@ config_h.set_quoted(
|
|||
'PACKAGE_BUGREPORT', package_bug_url,
|
||||
description : 'Define to the address where bug reports for this package should be sent.')
|
||||
|
||||
|
||||
|
||||
|
||||
# env
|
||||
#============================================================================
|
||||
|
||||
|
||||
# set install directories
|
||||
#-------------------------------------------------
|
||||
|
@ -96,7 +72,6 @@ mandir = join_paths(prefix, get_option('mandir'))
|
|||
includedir = join_paths(prefix, get_option('includedir'))
|
||||
|
||||
# set nix directories
|
||||
#-------------------------------------------------
|
||||
|
||||
# State should be stored in /nix/var, unless the user overrides it explicitly.
|
||||
if get_option('normal_var')
|
||||
|
@ -485,19 +460,14 @@ else
|
|||
endif
|
||||
|
||||
|
||||
# Look for Boehm garbage collector, an optional dependency.
|
||||
#--------------------------------------------------
|
||||
if (get_option('with_gc'))
|
||||
gc_dep = declare_dependency(
|
||||
dependencies : dependency('bdw-gc'),
|
||||
link_args : get_option('gc_link_args'))
|
||||
config_h.set(
|
||||
'HAVE_BOEHMGC', 1,
|
||||
description : 'Whether to use the Boehm garbage collector.')
|
||||
else
|
||||
gc_dep = dependency('', required: false)
|
||||
endif
|
||||
|
||||
# Look for Boehm garbage collector, a required dependency.
|
||||
# TODO(tazjin): Remove option to disable GC
|
||||
gc_dep = declare_dependency(
|
||||
dependencies : dependency('bdw-gc'),
|
||||
link_args : get_option('gc_link_args'))
|
||||
config_h.set(
|
||||
'HAVE_BOEHMGC', 1,
|
||||
description : 'Whether to use the Boehm garbage collector.')
|
||||
|
||||
# Look for aws-cpp-sdk-s3.
|
||||
#--------------------------------------------------
|
||||
|
|
1
third_party/nix/src/libexpr/meson.build
vendored
1
third_party/nix/src/libexpr/meson.build
vendored
|
@ -38,6 +38,7 @@ libexpr_headers = files(
|
|||
join_paths(meson.source_root(), 'src/libexpr/value-to-xml.hh'))
|
||||
|
||||
libexpr_dep_list = [
|
||||
gc_dep,
|
||||
libdl_dep,
|
||||
libsodium_dep]
|
||||
|
||||
|
|
1
third_party/nix/src/nix/meson.build
vendored
1
third_party/nix/src/nix/meson.build
vendored
|
@ -53,6 +53,7 @@ nix_headers = files (
|
|||
join_paths(meson.source_root(), 'src/nix-store/graphml.hh'))
|
||||
|
||||
nix_dep_list = [
|
||||
gc_dep,
|
||||
pthread_dep,
|
||||
libdl_dep,
|
||||
boost_dep,
|
||||
|
|
Loading…
Reference in a new issue