From 1f7f54f44100ea6916e6fefbe3a9139dbc4e1a37 Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Thu, 14 Nov 2019 14:50:47 -0800 Subject: [PATCH] Add $$ORIGIN/lib to rpath for fuzz targets. RPATH needs to be set to traverse the local directory's lib folder for fuzz target packages. Bug: N/A Test: m fuzz Change-Id: Idea4f04ce4c55315df7e808de5b2b4f06a88d82a --- cc/fuzz.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cc/fuzz.go b/cc/fuzz.go index 15eafc864..476d805ec 100644 --- a/cc/fuzz.go +++ b/cc/fuzz.go @@ -103,8 +103,11 @@ func (fuzz *fuzzBinary) linkerDeps(ctx DepsContext, deps Deps) Deps { func (fuzz *fuzzBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags { flags = fuzz.binaryDecorator.linkerFlags(ctx, flags) - // RunPaths on devices isn't instantiated by the base linker. + // RunPaths on devices isn't instantiated by the base linker. `../lib` for + // installed fuzz targets (both host and device), and `./lib` for fuzz + // target packages. flags.Local.LdFlags = append(flags.Local.LdFlags, `-Wl,-rpath,\$$ORIGIN/../lib`) + flags.Local.LdFlags = append(flags.Local.LdFlags, `-Wl,-rpath,\$$ORIGIN/lib`) return flags }