summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-08 15:32:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-09 16:37:24 +0100
commit3c1ed4a7dade2284dfd9ce6373b78f885ba30509 (patch)
treefd80bfa9f309b8f6656fb95d41c14d076885c841 /meta/classes
parentfdc9d9e4fc386e178800b15ea22a368749e90965 (diff)
downloadpoky-3c1ed4a7dade2284dfd9ce6373b78f885ba30509.tar.gz
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. (From OE-Core rev: ef347bd395955ce68893fee7995a4f3abbe6ff93) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/rust-common.bbclass18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass
index 8ee05f57f8..4c1a63df0d 100644
--- a/meta/classes/rust-common.bbclass
+++ b/meta/classes/rust-common.bbclass
@@ -114,7 +114,7 @@ RUST_TARGET_CXX = "${WRAPPER_DIR}/target-rust-cxx"
114RUST_TARGET_CCLD = "${WRAPPER_DIR}/target-rust-ccld" 114RUST_TARGET_CCLD = "${WRAPPER_DIR}/target-rust-ccld"
115RUST_TARGET_AR = "${WRAPPER_DIR}/target-rust-ar" 115RUST_TARGET_AR = "${WRAPPER_DIR}/target-rust-ar"
116 116
117create_wrapper () { 117create_wrapper_rust () {
118 file="$1" 118 file="$1"
119 shift 119 shift
120 extras="$1" 120 extras="$1"
@@ -148,22 +148,22 @@ do_rust_create_wrappers () {
148 mkdir -p "${WRAPPER_DIR}" 148 mkdir -p "${WRAPPER_DIR}"
149 149
150 # Yocto Build / Rust Host C compiler 150 # Yocto Build / Rust Host C compiler
151 create_wrapper "${RUST_BUILD_CC}" "" "${BUILD_CC}" 151 create_wrapper_rust "${RUST_BUILD_CC}" "" "${BUILD_CC}"
152 # Yocto Build / Rust Host C++ compiler 152 # Yocto Build / Rust Host C++ compiler
153 create_wrapper "${RUST_BUILD_CXX}" "" "${BUILD_CXX}" 153 create_wrapper_rust "${RUST_BUILD_CXX}" "" "${BUILD_CXX}"
154 # Yocto Build / Rust Host linker 154 # Yocto Build / Rust Host linker
155 create_wrapper "${RUST_BUILD_CCLD}" "" "${BUILD_CCLD}" "${BUILD_LDFLAGS}" 155 create_wrapper_rust "${RUST_BUILD_CCLD}" "" "${BUILD_CCLD}" "${BUILD_LDFLAGS}"
156 # Yocto Build / Rust Host archiver 156 # Yocto Build / Rust Host archiver
157 create_wrapper "${RUST_BUILD_AR}" "" "${BUILD_AR}" 157 create_wrapper_rust "${RUST_BUILD_AR}" "" "${BUILD_AR}"
158 158
159 # Yocto Target / Rust Target C compiler 159 # Yocto Target / Rust Target C compiler
160 create_wrapper "${RUST_TARGET_CC}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}" 160 create_wrapper_rust "${RUST_TARGET_CC}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}"
161 # Yocto Target / Rust Target C++ compiler 161 # Yocto Target / Rust Target C++ compiler
162 create_wrapper "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}" 162 create_wrapper_rust "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}"
163 # Yocto Target / Rust Target linker 163 # Yocto Target / Rust Target linker
164 create_wrapper "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}" 164 create_wrapper_rust "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}"
165 # Yocto Target / Rust Target archiver 165 # Yocto Target / Rust Target archiver
166 create_wrapper "${RUST_TARGET_AR}" "" "${WRAPPER_TARGET_AR}" 166 create_wrapper_rust "${RUST_TARGET_AR}" "" "${WRAPPER_TARGET_AR}"
167 167
168} 168}
169 169