Commit 3fdb8303 authored by Charlie Voiselle's avatar Charlie Voiselle
Browse files

Moved Quotes into commands

Moving the quotes down into the commands allows for LD_FLAGS to be extended if need be.
parent e13d5c2b
No related merge requests found
Showing with 9 additions and 9 deletions
+9 -9
......@@ -5,7 +5,7 @@ THIS_OS := $(shell uname)
GIT_COMMIT := $(shell git rev-parse HEAD)
GIT_DIRTY := $(if $(shell git status --porcelain),+CHANGES)
GO_LDFLAGS := "-X github.com/hashicorp/nomad/version.GitCommit=$(GIT_COMMIT)$(GIT_DIRTY)"
GO_LDFLAGS := -X github.com/hashicorp/nomad/version.GitCommit=$(GIT_COMMIT)$(GIT_DIRTY)
GO_TAGS =
default: help
......@@ -81,7 +81,7 @@ pkg/freebsd_amd64/nomad: $(SOURCE_FILES) ## Build Nomad for freebsd/amd64
@echo "==> Building $@ with tags $(GO_TAGS)..."
@CGO_ENABLED=1 GOOS=freebsd GOARCH=amd64 \
go build \
-ldflags $(GO_LDFLAGS) \
-ldflags "$(GO_LDFLAGS)" \
-tags "$(GO_TAGS)" \
-o "$@"
......@@ -89,7 +89,7 @@ pkg/linux_386/nomad: $(SOURCE_FILES) ## Build Nomad for linux/386
@echo "==> Building $@ with tags $(GO_TAGS)..."
@CGO_ENABLED=1 GOOS=linux GOARCH=386 \
go build \
-ldflags $(GO_LDFLAGS) \
-ldflags "$(GO_LDFLAGS)" \
-tags "$(GO_TAGS)" \
-o "$@"
......@@ -97,7 +97,7 @@ pkg/linux_amd64/nomad: $(SOURCE_FILES) ## Build Nomad for linux/amd64
@echo "==> Building $@ with tags $(GO_TAGS)..."
@CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
go build \
-ldflags $(GO_LDFLAGS) \
-ldflags "$(GO_LDFLAGS)" \
-tags "$(GO_TAGS)" \
-o "$@"
......@@ -105,7 +105,7 @@ pkg/linux_arm/nomad: $(SOURCE_FILES) ## Build Nomad for linux/arm
@echo "==> Building $@ with tags $(GO_TAGS)..."
@CGO_ENABLED=1 GOOS=linux GOARCH=arm CC=arm-linux-gnueabihf-gcc-5 \
go build \
-ldflags $(GO_LDFLAGS) \
-ldflags "$(GO_LDFLAGS)" \
-tags "$(GO_TAGS)" \
-o "$@"
......@@ -113,7 +113,7 @@ pkg/linux_arm64/nomad: $(SOURCE_FILES) ## Build Nomad for linux/arm64
@echo "==> Building $@ with tags $(GO_TAGS)..."
@CGO_ENABLED=1 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc-5 \
go build \
-ldflags $(GO_LDFLAGS) \
-ldflags "$(GO_LDFLAGS)" \
-tags "$(GO_TAGS)" \
-o "$@"
......@@ -126,7 +126,7 @@ pkg/windows_386/nomad: $(SOURCE_FILES) ## Build Nomad for windows/386
@echo "==> Building $@ with tags $(GO_TAGS)..."
@CGO_ENABLED=1 GOOS=windows GOARCH=386 \
go build \
-ldflags $(GO_LDFLAGS) \
-ldflags "$(GO_LDFLAGS)" \
-tags "$(GO_TAGS)" \
-o "$@.exe"
......@@ -134,7 +134,7 @@ pkg/windows_amd64/nomad: $(SOURCE_FILES) ## Build Nomad for windows/amd64
@echo "==> Building $@ with tags $(GO_TAGS)..."
@CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \
go build \
-ldflags $(GO_LDFLAGS) \
-ldflags "$(GO_LDFLAGS)" \
-tags "$(GO_TAGS)" \
-o "$@.exe"
......@@ -142,7 +142,7 @@ pkg/linux_amd64-lxc/nomad: $(SOURCE_FILES) ## Build Nomad+LXC for linux/amd64
@echo "==> Building $@ with tags $(GO_TAGS)..."
@CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
go build \
-ldflags $(GO_LDFLAGS) \
-ldflags "$(GO_LDFLAGS)" \
-tags "$(GO_TAGS) lxc" \
-o "$@"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment