diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-05-10 13:08:22 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-05-11 15:26:43 +0300 |
| commit | 6e508f38f794da97a97b339c5e98738fd307d38d (patch) | |
| tree | 6eab067ebdf61e5ffa12feb56f78825ebe1a93cb | |
| parent | 379484632c2c51de427920fc33f70a4e3c56b88c (diff) | |
Makefile: Simplify quoting for ldflags
The quoting we're using to pass both `GO_LDFLAGS` as well as our GNU
build ID to `-ldflags` is kind of awkward. Simplify it to instead just
quote both parts.
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -293,7 +293,7 @@ ${BUILD_DIR}/bin/%: .FORCE @ # GNU build-id from the empty string and causing guaranteed collisions. ${Q}GO_BUILD_ID=$$( go tool buildid "$@" || openssl rand -hex 32 ) && \ GNU_BUILD_ID=$$( echo $$GO_BUILD_ID | sha1sum | cut -d' ' -f1 ) && \ - go build -o "$@" -ldflags '${GO_LDFLAGS}'" -B 0x$$GNU_BUILD_ID" -tags "${GO_BUILD_TAGS}" $(addprefix ${SOURCE_DIR}/cmd/,$(@F)) + go build -o "$@" -ldflags '${GO_LDFLAGS} -B 0x$$GNU_BUILD_ID' -tags "${GO_BUILD_TAGS}" $(addprefix ${SOURCE_DIR}/cmd/,$(@F)) .PHONY: install ## Install Gitaly binaries. The target directory can be modified by setting PREFIX and DESTDIR. |