From 0ed8c0645cbea9e6cbac171dd1b1a44d40b78665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Tue, 7 Jul 2020 16:01:14 +0200 Subject: [PATCH] Fix version and OAuth client information being injected via `make` --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fd219d42d..09d66b982 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,10 @@ ifndef CGO_LDFLAGS endif GO_LDFLAGS := -X github.com/cli/cli/command.Version=$(GH_VERSION) -GO_LDFLAGS := -X github.com/cli/cli/command.BuildDate=$(BUILD_DATE) +GO_LDFLAGS := -X github.com/cli/cli/command.BuildDate=$(BUILD_DATE) $(GO_LDFLAGS) ifdef GH_OAUTH_CLIENT_SECRET - GO_LDFLAGS := -X github.com/cli/cli/internal/config.oauthClientID=$(GH_OAUTH_CLIENT_ID) - GO_LDFLAGS := -X github.com/cli/cli/internal/config.oauthClientSecret=$(GH_OAUTH_CLIENT_SECRET) + GO_LDFLAGS := -X github.com/cli/cli/internal/config.oauthClientID=$(GH_OAUTH_CLIENT_ID) $(GO_LDFLAGS) + GO_LDFLAGS := -X github.com/cli/cli/internal/config.oauthClientSecret=$(GH_OAUTH_CLIENT_SECRET) $(GO_LDFLAGS) endif bin/gh: $(BUILD_FILES)