package/cargo: pass appropriate library path to the linker

Message ID 20181228132551.29819-1-thomas.petazzoni@bootlin.com
State Accepted
Commit b5e1b51dd1ee68ee342a3340c9c947c083861eb8
Headers show
Series
  • package/cargo: pass appropriate library path to the linker
Related show

Commit Message

Thomas Petazzoni Dec. 28, 2018, 1:25 p.m.
When linking the host cargo binary, the linker should be told to find
libraries in $(HOST_DIR)/lib, otherwise it will not work libraries
such as libhttp_parser. This was found with per-package directory
support, where the build failed with:

  = note: /usr/bin/ld: cannot find -lhttp_parser
          collect2: error: ld returned 1 exit status

In order to fix this, instead of passing -L$(HOST_DIR)/lib during the
build of Cargo, we make sure all flags in $(HOST_LDFLAGS) are passed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/cargo/cargo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Korsgaard Jan. 17, 2019, 10:04 p.m. | #1
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > When linking the host cargo binary, the linker should be told to find
 > libraries in $(HOST_DIR)/lib, otherwise it will not work libraries

s/work/find/

> such as libhttp_parser. This was found with per-package directory
 > support, where the build failed with:

 >   = note: /usr/bin/ld: cannot find -lhttp_parser
 >           collect2: error: ld returned 1 exit status

 > In order to fix this, instead of passing -L$(HOST_DIR)/lib during the
 > build of Cargo, we make sure all flags in $(HOST_LDFLAGS) are passed.

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 > ---
 >  package/cargo/cargo.mk | 2 +-
 >  1 file changed, 1 insertion(+), 1 deletion(-)

 > diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk
 > index 1b1053ba41..a387281b4c 100644
 > --- a/package/cargo/cargo.mk
 > +++ b/package/cargo/cargo.mk
 > @@ -70,7 +70,7 @@ HOST_CARGO_SNAP_OPTS = \
 >  	$(if $(VERBOSE),--verbose)
 
 >  HOST_CARGO_ENV = \
 > -	RUSTFLAGS="-Clink-arg=-Wl,-rpath,$(HOST_DIR)/lib" \
 > +	RUSTFLAGS="$(addprefix -Clink-arg=,$(HOST_LDFLAGS))" \

The -Clink-arg= thing looked odd to me, but is apparently how linker
flags are passed:

https://github.com/rust-lang/rust/pull/36574

Committed, thanks.
Peter Korsgaard Jan. 28, 2019, 5:15 p.m. | #2
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > When linking the host cargo binary, the linker should be told to find
 > libraries in $(HOST_DIR)/lib, otherwise it will not work libraries
 > such as libhttp_parser. This was found with per-package directory
 > support, where the build failed with:

 >   = note: /usr/bin/ld: cannot find -lhttp_parser
 >           collect2: error: ld returned 1 exit status

 > In order to fix this, instead of passing -L$(HOST_DIR)/lib during the
 > build of Cargo, we make sure all flags in $(HOST_LDFLAGS) are passed.

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2018.02.x and 2018.11.x, thanks.

Patch

diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk
index 1b1053ba41..a387281b4c 100644
--- a/package/cargo/cargo.mk
+++ b/package/cargo/cargo.mk
@@ -70,7 +70,7 @@  HOST_CARGO_SNAP_OPTS = \
 	$(if $(VERBOSE),--verbose)
 
 HOST_CARGO_ENV = \
-	RUSTFLAGS="-Clink-arg=-Wl,-rpath,$(HOST_DIR)/lib" \
+	RUSTFLAGS="$(addprefix -Clink-arg=,$(HOST_LDFLAGS))" \
 	CARGO_HOME=$(HOST_CARGO_HOME)
 
 define HOST_CARGO_BUILD_CMDS