StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add $ORIGIN to rpath for cc_test modules" into main am: 783fa37807

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3083002

Change-Id: I0b3ae062fda3c154864318cd641428982ad1bf87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2024-05-13 21:25:33 +00:00
committed by Automerger Merge Worker
parent a2b9aced73 783fa37807
commit 37ba7771d5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/test.go
View File

@@ -359,6 +359,12 @@ func (test *testBinary) linkerDeps(ctx DepsContext, deps Deps) Deps {
func (test *testBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags { func (test *testBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags {
flags = test.binaryDecorator.linkerFlags(ctx, flags) flags = test.binaryDecorator.linkerFlags(ctx, flags)
flags = test.testDecorator.linkerFlags(ctx, flags) flags = test.testDecorator.linkerFlags(ctx, flags)
// Add a default rpath to allow tests to dlopen libraries specified in data_libs.
// Host modules already get an rpath specified in linker.go.
if !ctx.Host() {
flags.Global.LdFlags = append(flags.Global.LdFlags, `-Wl,-rpath,\$$ORIGIN`)
}
return flags return flags
} }