diff options
Diffstat (limited to 'cc/test.go')
| -rw-r--r-- | cc/test.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/test.go b/cc/test.go index fa75f4839..9df346758 100644 --- a/cc/test.go +++ b/cc/test.go @@ -175,11 +175,16 @@ func (test *testDecorator) linkerDeps(ctx BaseModuleContext, deps Deps) Deps { } func (test *testDecorator) linkerInit(ctx BaseModuleContext, linker *baseLinker) { + // add ../../lib[64] to rpath so that out/host/linux-x86/nativetest/<test dir>/<test> can + // find out/host/linux-x86/lib[64]/library.so runpath := "../../lib" if ctx.toolchain().Is64Bit() { runpath += "64" } linker.dynamicProperties.RunPaths = append(linker.dynamicProperties.RunPaths, runpath) + + // add "" to rpath so that test binaries can find libraries in their own test directory + linker.dynamicProperties.RunPaths = append(linker.dynamicProperties.RunPaths, "") } func (test *testDecorator) linkerProps() []interface{} { |