From bd9acaf584b5f210e90648c8b0c955c92c28d9de Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sun, 2 Oct 2016 20:11:16 +1100 Subject: [PATCH] conmon: minor fixes This fixes a bug where --conmon wouldn't actually set the conmon binary path, and also where we weren't setting CFLAGS while compiling conmon. Signed-off-by: Aleksa Sarai --- cmd/server/main.go | 1 + conmon/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index 55d5c698..d1f28aa1 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -116,6 +116,7 @@ func main() { containerDir := c.String("containerdir") sandboxDir := c.String("sandboxdir") + conmonPath := c.String("conmon") pausePath := c.String("pause") service, err := server.New(c.String("runtime"), c.String("root"), sandboxDir, containerDir, conmonPath, pausePath) if err != nil { diff --git a/conmon/Makefile b/conmon/Makefile index 1df60a69..c8c7c4a9 100644 --- a/conmon/Makefile +++ b/conmon/Makefile @@ -5,7 +5,7 @@ override LIBS += $(shell pkg-config --libs glib-2.0) override CFLAGS += -Wall -Wextra $(shell pkg-config --cflags glib-2.0) conmon: $(obj) - $(CC) -o $@ $^ $(LIBS) + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) .PHONY: clean clean: