Fix inability to override LDFLAGS when env variables were supplied to…

… make
chemist · Feb 21, 2018 · a013fb3 · a013fb3
1 parent f63e552
commit a013fb3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -26,15 +26,16 @@ override LDFLAGS += \
 # docker image publishing options
 DOCKER_PUSH=false
 IMAGE_TAG=latest
+
 ifneq (${GIT_TAG},)
 IMAGE_TAG=${GIT_TAG}
-LDFLAGS += -X ${PACKAGE}.gitTag=${GIT_TAG}
+override LDFLAGS += -X ${PACKAGE}.gitTag=${GIT_TAG}
 endif
 ifneq (${IMAGE_NAMESPACE},)
-LDFLAGS += -X ${PACKAGE}/cmd/argo/commands.imageNamespace=${IMAGE_NAMESPACE}
+override LDFLAGS += -X ${PACKAGE}/cmd/argo/commands.imageNamespace=${IMAGE_NAMESPACE}
 endif
 ifneq (${IMAGE_TAG},)
-LDFLAGS += -X ${PACKAGE}/cmd/argo/commands.imageTag=${IMAGE_TAG}
+override LDFLAGS += -X ${PACKAGE}/cmd/argo/commands.imageTag=${IMAGE_TAG}
 endif
 
 ifeq (${DOCKER_PUSH},true)