From 108a72f45859a76430b680defdd312caccd0c299 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 28 Jan 2013 08:35:53 -0800 Subject: [PATCH] Makefile: Mac's shell built-in echo doesn't have -n; was being passed to go Change-Id: I792758750333c51068b91518564c8650fb8fc8e3 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 64a486dc6..88fedef57 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ all: - go install `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo -n "--tags=with_sqlite"` ./pkg/... ./server/... ./cmd/... ./third_party/... + go install `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` ./pkg/... ./server/... ./cmd/... ./third_party/... # Workaround Go bug where the $GOPATH/pkg cache doesn't know about tag changes. # Useful when you accidentally run "make" and then "make presubmit" doesn't work. @@ -8,7 +8,7 @@ forcefull: go install -a --tags=with_sqlite ./pkg/... ./server/... ./cmd/... ./third_party/... presubmit: - SKIP_DEP_TESTS=1 go test `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo -n "--tags=with_sqlite"` -short ./pkg/... ./server/camlistored ./cmd/... && echo PASS + SKIP_DEP_TESTS=1 go test `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` -short ./pkg/... ./server/camlistored ./cmd/... && echo PASS embeds: go install ./pkg/fileembed/genfileembed/ && genfileembed ./server/camlistored/ui && genfileembed ./pkg/server