Skip to content

Commit 59be97f

Browse files
committed
fix: ensure -zlazy for systems that default to -znow
1 parent c66ddd1 commit 59be97f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/go-build-wrapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basen
116116
go build \
117117
$tags \
118118
-trimpath \
119-
-ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
119+
-ldflags "-extldflags '-Wl,-z,lazy,-dynamic-linker,$dynamic_linker,-rpath,/run/host$libc_dir_canonical_dirname,--export-dynamic,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
120120
-o "$2/$3"
121121

122122
exit "$?"

src/meson_generate_completions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
completion_type = sys.argv[2]
3030

3131
os.chdir(source_dir)
32-
output = subprocess.run(['go', 'run', '.', 'completion', completion_type], check=True)
32+
output = subprocess.run(['go', 'run', '-ldflags=-extldflags=-Wl,-z,lazy' '.', 'completion', completion_type], check=True)
3333

3434
sys.exit(0)

0 commit comments

Comments
 (0)