From 0ed55291b65d84c68c270b397c1e7815f4d13629 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 26 Jan 2016 17:11:25 -0500 Subject: [PATCH] cargo: relocate config files to avoid clobber --- classes/cargo.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/classes/cargo.bbclass b/classes/cargo.bbclass index 598bdea..254e5b3 100644 --- a/classes/cargo.bbclass +++ b/classes/cargo.bbclass @@ -31,19 +31,19 @@ export PKG_CONFIG_ALLOW_CROSS = "1" EXTRA_OECARGO_PATHS ??= "" cargo_do_configure () { - 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 - # config to be silently ignored. + # FIXME: we currently make a mess in the directory above us + # (${WORKDIR}), which may not be ideal. Look into whether this is + # allowed + mkdir -p ../.cargo # NOTE: we cannot pass more flags via this interface, the 'linker' is # assumed to be a path to a binary. If flags are needed, a wrapper must # be used. - echo "paths = [" >.cargo/config + echo "paths = [" >../.cargo/config for p in ${EXTRA_OECARGO_PATHS}; do printf "\"%s\"\n" "$p" - done | sed -e 's/$/,/' >>.cargo/config - echo "]" >>.cargo/config + done | sed -e 's/$/,/' >>../.cargo/config + echo "]" >>../.cargo/config } rust_cargo_patch () {