Fix version and OAuth client information being injected via make

mislav · mislav · commit 0ed8c0645cbe · 2020-07-07T16:01:14.000+02:00
diff --git 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)
