diff options
| author | Toon Claes <toon@gitlab.com> | 2022-04-14 22:45:47 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-04-14 22:45:47 +0300 |
| commit | fa2d37aadad24b730c4d85caf43465864b8e1a5d (patch) | |
| tree | 99b8c74d7dc606b203d933d14aaf95919c63efef | |
| parent | 6ff441e3d1303f9507c0ca2bf599d2fe8f5798d8 (diff) | |
| parent | c543e03696eec58c6670a3ef8e0931c13d7c8a4c (diff) | |
Merge branch 'toon-go-fixes' into 'master'
Makefile: Make GITALY_EXECUTABLES deferred again
See merge request gitlab-org/gitaly!4477
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -210,7 +210,7 @@ TEST_REPO_GIT := ${TEST_REPO_DIR}/gitlab-git-test.git BENCHMARK_REPO := ${TEST_REPO_DIR}/benchmark.git # All executables provided by Gitaly -GITALY_EXECUTABLES := $(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) +GITALY_EXECUTABLES = $(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) # Find all Go source files. find_go_sources = $(shell find ${SOURCE_DIR} -type d \( -name ruby -o -name vendor -o -name testdata -o -name '_*' -o -path '*/proto/go/gitalypb' \) -prune -o -type f -name '*.go' -not -name '*.pb.go' -print | sort -u) |