From 459bc5d88ae558b47cca4bc78a890cf1c3dbbc0d Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 17 Nov 2014 03:39:57 -0500
Subject: [PATCH] tweaks

---
 classes/rust.bbclass                               | 11 +++++------
 .../rust-hello-world/rust-hello-world_git.bb       |  2 +-
 recipes/cargo/cargo.inc                            | 14 ++++----------
 recipes/rust/rust.inc                              |  3 +--
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/classes/rust.bbclass b/classes/rust.bbclass
index 0eecae4..dce8074 100644
--- a/classes/rust.bbclass
+++ b/classes/rust.bbclass
@@ -59,9 +59,7 @@ RUST_TARGET_SYS = "${@rust_base_triple(d, 'TARGET')}"
 
 
 # FIXME: the 'rustlib' element of this is to workaround rustc forgetting the libdir it was built with.
-RUST_PATH_NATIVE="${STAGING_LIBDIR_NATIVE}:\
-${STAGING_BASE_LIBDIR_NATIVE}:\
-${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/rustlib/${TARGET_SYS}/lib"
+RUST_PATH_NATIVE="${STAGING_LIBDIR_NATIVE}:${STAGING_BASE_LIBDIR_NATIVE}:${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/rustlib/${TARGET_SYS}/lib"
 
 # FIXME: set based on whether we are native vs cross vs buildsdk, etc
 export RUST_PATH ??= "${RUST_PATH_NATIVE}"
@@ -80,7 +78,7 @@ oe_runrustc () {
 	"${RUSTC}" ${RUSTC_ARCHFLAGS} ${RUSTC_FLAGS} "$@"
 }
 
-oe_cargo_config () {
+cargo_config () {
 	mkdir -p .cargo
 	# FIXME: we currently blow away the entire config because duplicate
 	# sections are treated as a parse error by cargo (causing the entire
@@ -96,7 +94,8 @@ oe_cargo_config () {
 	echo "]" >>.cargo/config
 }
 
-oe_cargo_patch () {
+rust_cargo_patch () {
+	cd "${S}"
 	cat >>Cargo.toml <<EOF
 [profile.dev]
 rpath = true
@@ -105,7 +104,7 @@ rpath = true
 EOF
 }
 
-oe_runcargo_build () {
+cargo_build () {
 	# FIXME: if there is already an entry for this target, in an existing
 	# cargo/config, this won't work.
 	which cargo
diff --git a/recipes-example/rust-hello-world/rust-hello-world_git.bb b/recipes-example/rust-hello-world/rust-hello-world_git.bb
index 669f640..e32b9c2 100644
--- a/recipes-example/rust-hello-world/rust-hello-world_git.bb
+++ b/recipes-example/rust-hello-world/rust-hello-world_git.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
 B = "${S}"
 
 do_compile () {
-	oe_runcargo_build
+	cargo_build
 }
 
 do_install () {
diff --git a/recipes/cargo/cargo.inc b/recipes/cargo/cargo.inc
index b25ac3a..27f53e7 100644
--- a/recipes/cargo/cargo.inc
+++ b/recipes/cargo/cargo.inc
@@ -20,13 +20,7 @@ S = "${WORKDIR}/git"
 B = "${S}"
 
 do_cargo_config_patch () {
-	cd "${S}"
-	cat >>Cargo.toml <<EOF
-[profile.dev]
-rpath = true
-[profile.release]
-rpath = true
-EOF
+	rust_cargo_patch
 }
 addtask cargo_config_patch after do_patch before do_configure
 do_cargo_config_patch[dirs] = "${WORKDIR}"
@@ -34,9 +28,9 @@ do_cargo_config_patch[dirs] = "${WORKDIR}"
 do_configure () {
 	"${S}/configure" \
 		"--prefix=${prefix}"			\
-		"--build=${RUST_BUILD_SYS}"		\
-		"--host=${RUST_HOST_SYS}"		\
-		"--target=${RUST_TARGET_SYS}"		\
+		"--build=${BUILD_SYS}"			\
+		"--host=${HOST_SYS}"			\
+		"--target=${TARGET_SYS}"		\
 		"--localstatedir=${localstatedir}"	\
 		"--sysconfdir=${sysconfdir}"		\
 		"--datadir=${datadir}"			\
diff --git a/recipes/rust/rust.inc b/recipes/rust/rust.inc
index a13f7f0..b14e687 100644
--- a/recipes/rust/rust.inc
+++ b/recipes/rust/rust.inc
@@ -113,8 +113,7 @@ def rust_gen_target(d, thing, wd):
     features = d.getVarFlag('FEATURES', arch, True) or ""
 
     pre_link_args = (d.getVarFlag('PRE_LINK_ARGS', arch, True) or "").split()
-    if thing == 'TARGET':
-        pre_link_args.extend((d.getVar('TARGET_PRE_LINK_ARGS_PREPEND', True) or "").split())
+    pre_link_args.extend((d.getVar('{}_PRE_LINK_ARGS_PREPEND'.format(thing), True) or "").split())
 
     o.write('''{{
          "data-layout": "{}",