diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-07 17:46:39 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-07 17:46:39 +0000 |
commit | f7ba16f9cbc27b141f1797a7c4f1fd3243f31683 (patch) | |
tree | f4311bcd8bd9fe14abbd29233503d101d067aa23 /src/nix/repl.cc | |
parent | 47644e49ca252441fcc3ae57f5a01e7fc579ba8c (diff) | |
parent | 3c75ddc16b054a7dabf0710ee0a4323b4371effd (diff) |
Merge remote-tracking branch 'upstream/master' into drv-outputs-map-allow-missing
Diffstat (limited to 'src/nix/repl.cc')
-rw-r--r-- | src/nix/repl.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/nix/repl.cc b/src/nix/repl.cc index fb9050d0d..c3c9e54a8 100644 --- a/src/nix/repl.cc +++ b/src/nix/repl.cc @@ -33,12 +33,17 @@ extern "C" { #include "command.hh" #include "finally.hh" +#if HAVE_BOEHMGC #define GC_INCLUDE_NEW #include <gc/gc_cpp.h> +#endif namespace nix { -struct NixRepl : gc +struct NixRepl + #if HAVE_BOEHMGC + : gc + #endif { string curDir; std::unique_ptr<EvalState> state; |