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 <asarai@suse.de>
sameo · Oct 2, 2016 · bd9acaf · bd9acaf
1 parent bac579a
commit bd9acaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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: