rust-common: Remove conflict with utils create_wrapper

utils already has a create_wrapper function which I tried to use from cargo
and got unexpected results. Rename the rust function to avoid this conflict
of named.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass
index 8ee05f57f86f9e42f5b5c87ef60563eeb4ee05e7..4c1a63df0dce8a6e813bbf42b57363fea610582b 100644 (file)
--- a/meta/classes/rust-common.bbclass
+++ b/meta/classes/rust-common.bbclass
@@ -114,7 +114,7 @@ RUST_TARGET_CXX = "${WRAPPER_DIR}/target-rust-cxx"
 RUST_TARGET_CCLD = "${WRAPPER_DIR}/target-rust-ccld"
 RUST_TARGET_AR = "${WRAPPER_DIR}/target-rust-ar"
 
-create_wrapper () {
+create_wrapper_rust () {
        file="$1"
        shift
        extras="$1"
@@ -148,22 +148,22 @@ do_rust_create_wrappers () {
        mkdir -p "${WRAPPER_DIR}"
 
        # Yocto Build / Rust Host C compiler
-       create_wrapper "${RUST_BUILD_CC}" "" "${BUILD_CC}"
+       create_wrapper_rust "${RUST_BUILD_CC}" "" "${BUILD_CC}"
        # Yocto Build / Rust Host C++ compiler
-       create_wrapper "${RUST_BUILD_CXX}" "" "${BUILD_CXX}"
+       create_wrapper_rust "${RUST_BUILD_CXX}" "" "${BUILD_CXX}"
        # Yocto Build / Rust Host linker
-       create_wrapper "${RUST_BUILD_CCLD}" "" "${BUILD_CCLD}" "${BUILD_LDFLAGS}"
+       create_wrapper_rust "${RUST_BUILD_CCLD}" "" "${BUILD_CCLD}" "${BUILD_LDFLAGS}"
        # Yocto Build / Rust Host archiver
-       create_wrapper "${RUST_BUILD_AR}" "" "${BUILD_AR}"
+       create_wrapper_rust "${RUST_BUILD_AR}" "" "${BUILD_AR}"
 
        # Yocto Target / Rust Target C compiler
-       create_wrapper "${RUST_TARGET_CC}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}"
+       create_wrapper_rust "${RUST_TARGET_CC}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}"
        # Yocto Target / Rust Target C++ compiler
-       create_wrapper "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}"
+       create_wrapper_rust "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}"
        # Yocto Target / Rust Target linker
-       create_wrapper "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}"
+       create_wrapper_rust "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}"
        # Yocto Target / Rust Target archiver
-       create_wrapper "${RUST_TARGET_AR}" "" "${WRAPPER_TARGET_AR}"
+       create_wrapper_rust "${RUST_TARGET_AR}" "" "${WRAPPER_TARGET_AR}"
 
 }