From e797b4d09bdcf1fbd1b42785fa9aeaf41a08d7d6 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sun, 17 May 2020 22:27:53 +0100
Subject: chore(3p/nix): Always enable the garbage collector

It's unclear why this toggle existed, now it doesn't.
---
 third_party/nix/corepkgs/meson.build    | 26 -------------------
 third_party/nix/meson.build             | 46 ++++++---------------------------
 third_party/nix/src/libexpr/meson.build |  1 +
 third_party/nix/src/nix/meson.build     |  1 +
 4 files changed, 10 insertions(+), 64 deletions(-)

(limited to 'third_party')

diff --git a/third_party/nix/corepkgs/meson.build b/third_party/nix/corepkgs/meson.build
index 57add8d65f..383909b0f7 100644
--- a/third_party/nix/corepkgs/meson.build
+++ b/third_party/nix/corepkgs/meson.build
@@ -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',
diff --git a/third_party/nix/meson.build b/third_party/nix/meson.build
index 3f9cfb3d58..bd5cd8ce7e 100644
--- a/third_party/nix/meson.build
+++ b/third_party/nix/meson.build
@@ -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.
 #--------------------------------------------------
diff --git a/third_party/nix/src/libexpr/meson.build b/third_party/nix/src/libexpr/meson.build
index b60ec33fa6..76f3014388 100644
--- a/third_party/nix/src/libexpr/meson.build
+++ b/third_party/nix/src/libexpr/meson.build
@@ -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]
 
diff --git a/third_party/nix/src/nix/meson.build b/third_party/nix/src/nix/meson.build
index 2ccda218d6..3fc841a48e 100644
--- a/third_party/nix/src/nix/meson.build
+++ b/third_party/nix/src/nix/meson.build
@@ -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,
-- 
cgit 1.4.1