scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 10:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

backport of commit fd26fd5e7a (#20521)

Browse Source 
Co-authored-by: Christopher Swenson <christopher.swenson@hashicorp.com>
This commit is contained in:
hc-github-team-secure-vault-core
2023-05-04 16:48:59 -04:00
committed by GitHub
parent ca6f644c03
commit c33ebe97cc
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/20519.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:improvement
Add debug symbols back to builds to fix Dynatrace support
```

7
scripts/ci-helper.sh
View File

@@ -151,17 +151,16 @@ function build() {
prerelease=$(version_pre) prerelease=$(version_pre)
build_date=$(build_date) build_date=$(build_date)
: "${GO_TAGS:=""}" : "${GO_TAGS:=""}"
: "${KEEP_SYMBOLS:=""}" : "${REMOVE_SYMBOLS:=""}"
# Build our ldflags # Build our ldflags
msg="--> Building Vault v$version, revision $revision, built $build_date" msg="--> Building Vault v$version, revision $revision, built $build_date"
# Keep the symbol and dwarf information by default # Keep the symbol and dwarf information by default
# TODO: maybe add REMOVE_SYMBOLS? if [ -n "$REMOVE_SYMBOLS" ]; then
if [ -n "$KEEP_SYMBOLS" ]; then
ldflags="-s -w " ldflags="-s -w "
else else
ldflags="-s -w " ldflags=""
fi fi
ldflags="${ldflags}-X github.com/hashicorp/vault/version.Version=$version -X github.com/hashicorp/vault/version.GitCommit=$revision -X github.com/hashicorp/vault/version.BuildDate=$build_date" ldflags="${ldflags}-X github.com/hashicorp/vault/version.Version=$version -X github.com/hashicorp/vault/version.GitCommit=$revision -X github.com/hashicorp/vault/version.BuildDate=$build_date"