diff options
| author | Tor Egge <Tor.Egge@yahooinc.com> | 2022-09-26 15:52:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 15:52:34 +0200 |
| commit | a49b2285e2db0d500cc8b01d34da0412fcf6f1fd (patch) | |
| tree | dee09687cd19d4af03b625294d356b59d3530e8c /client | |
| parent | 84332a69d6e03d6566aad70a7a69dc7119263a86 (diff) | |
| parent | 4d6cd3880d386ac7cf5c46186106ef63d12270a7 (diff) | |
Merge pull request #24214 from vespa-engine/toregge/adjust-go-build
Use real outputs for custom command that builds go binaries.
Diffstat (limited to 'client')
| -rw-r--r-- | client/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | client/go/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 052745f6f2f..42ebb9b573c 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -4,12 +4,12 @@ set(GODIR ${CMAKE_CURRENT_SOURCE_DIR}/go) file(GLOB_RECURSE GOSRCFILES ${GODIR}/*.go) -add_custom_command(OUTPUT ${GODIR}/bin/vespa-logfmt ${GODIR}/bin/vespa-deploy +add_custom_command(OUTPUT ${GODIR}/bin/vespa ${GODIR}/bin/script-utils COMMAND make DEPENDS ${GODIR}/Makefile ${GOSRCFILES} WORKING_DIRECTORY ${GODIR}) -add_custom_target(vespalog_logfmt ALL DEPENDS ${GODIR}/bin/vespa-logfmt) +add_custom_target(client_go_binaries ALL DEPENDS ${GODIR}/bin/vespa ${GODIR}/bin/script-utils) install(PROGRAMS ${GODIR}/bin/script-utils DESTINATION libexec/vespa) install_symlink(libexec/vespa/script-utils bin/vespa-logfmt) diff --git a/client/go/Makefile b/client/go/Makefile index 8a07f880c24..8779c1bfe25 100644 --- a/client/go/Makefile +++ b/client/go/Makefile @@ -127,7 +127,7 @@ manpages: install clean: rm -rf $(DIST) - rm -f $(BIN)/vespa $(SHARE)/man/man1/vespa.1 $(SHARE)/man/man1/vespa-*.1 + rm -f $(BIN)/vespa $(BIN)/script-utils $(SHARE)/man/man1/vespa.1 $(SHARE)/man/man1/vespa-*.1 rmdir -p $(BIN) $(SHARE)/man/man1 > /dev/null 2>&1 || true test: ci |