From 495c2c739035555d1708a32b65a98cf6986ddc4b Mon Sep 17 00:00:00 2001 From: yusing Date: Wed, 22 Jan 2025 06:14:02 +0800 Subject: [PATCH] fix makefile --- Dockerfile | 6 +++--- Makefile | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index e982c2e..5da0337 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,14 +17,14 @@ RUN --mount=type=cache,target="/go/pkg/mod" \ ENV GOCACHE=/root/.cache/go-build -ARG VERSION -ENV VERSION=${VERSION} - COPY Makefile /src/ COPY cmd /src/cmd COPY internal /src/internal COPY pkg /src/pkg +ARG VERSION +ENV VERSION=${VERSION} + ARG BUILD_FLAGS ENV BUILD_FLAGS=${BUILD_FLAGS} diff --git a/Makefile b/Makefile index 0b8fa4c..934e44e 100755 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ export GOOS = linux LDFLAGS = -X github.com/yusing/go-proxy/pkg.version=${VERSION} ifeq ($(trace), 1) - GODOXY_TRACE=1 + GODOXY_TRACE ?= 1 endif ifeq ($(debug), 1) @@ -14,10 +14,11 @@ ifeq ($(debug), 1) BUILD_FLAGS = '' else ifeq ($(pprof), 1) CGO_ENABLED = 1 - GODEBUG=gctrace=1 inittrace=1 schedtrace=3000 - GORACE=log_path=logs/pprof strip_path_prefix=$(shell pwd)/ - BUILD_FLAGS = -race -gcflags=all="-N -l" -tags pprof + GODEBUG = gctrace=1 inittrace=1 schedtrace=3000 + GORACE = log_path=logs/pprof strip_path_prefix=$(shell pwd)/ + BUILD_FLAGS = -race -gcflags=all='-N -l' -tags pprof DOCKER_TAG = pprof + VERSION += -pprof else CGO_ENABLED = 0 LDFLAGS += -s -w @@ -25,6 +26,8 @@ else DOCKER_TAG = latest endif +BUILD_FLAGS += -ldflags='$(LDFLAGS)' + export CGO_ENABLED export GODOXY_DEBUG export GODOXY_TRACE