diff --git a/CHANGELOG.md b/CHANGELOG.md index a78c6be..bdf0023 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Unreleased * Fix typo in English description of "Keep Syncthing alive" setting ([PR #67]) +* Fix reproducible builds issue caused by overridden ldflags ([PR #69]) ### Version 1.16 @@ -177,3 +178,4 @@ [PR #63]: https://github.com/chenxiaolong/BasicSync/pull/63 [PR #66]: https://github.com/chenxiaolong/BasicSync/pull/66 [PR #67]: https://github.com/chenxiaolong/BasicSync/pull/67 +[PR #69]: https://github.com/chenxiaolong/BasicSync/pull/69 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2eaa544..8884b07 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -519,6 +519,10 @@ val stbridge = tasks.register("stbridge") { "-X github.com/syncthing/syncthing/lib/build.Tags=${tags.joinToString(",")}", // https://github.com/wlynxg/anet#how-to-build-with-go-1230-or-later "-checklinkname=0", + // We need to repeat the ldflags from the goenv task. There is currently no way to + // extend the existing value provided via an environment variable. + // https://github.com/golang/go/issues/38522 + "-buildid=", ) executable(gomobileExecutable)