Merge pull request #3132 from matthewbauer/handle-sandbox-shell

Handle empty sandbox_shell
2019-10-09 14:52:51 +02:00 · 2019-10-09 14:52:51 +02:00 · 08ad9714e1
parent 7c74f075f4 199e888785
commit 08ad9714e1
1 changed files with 4 additions and 1 deletions
--- 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: