diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-10-08 23:12:31 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-10-08 23:12:54 -0400 |
| commit | 199e888785bd23073e44e56f6c74b95dc7c10ffa (patch) | |
| tree | ffeb90035b758e2a70f8d49ab55cd6d193c857e6 /src/libstore | |
| parent | a7e92863593792e7dc550effa8f6be08e6af7e3f (diff) | |
Handle empty sandbox_shell
Previously, SANDBOX_SHELL was set to empty when unavailable. This
caused issues when actually generating the sandbox. Instead, just set
SANDBOX_SHELL when --with-sandbox-shell= is non-empty. Alternative
implementation to https://github.com/NixOS/nix/pull/3038.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/local.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 89fc918c3..d690fea28 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -39,9 +39,12 @@ libstore_CXXFLAGS = \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ -DNIX_MAN_DIR=\"$(mandir)\" \ - -DSANDBOX_SHELL="\"$(sandbox_shell)\"" \ -DLSOF=\"$(lsof)\" +ifneq ($(sandbox_shell),) +libstore_CXXFLAGS += -DSANDBOX_SHELL="\"$(sandbox_shell)\"" +endif + $(d)/local-store.cc: $(d)/schema.sql.gen.hh $(d)/build.cc: |