mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #303 from janderholm/nativebuilds

Browse Source 
Fix *-native cargo builds
This commit is contained in:
Cody Schafer
2021-02-08 10:14:12 -05:00
committed by GitHub
parent 2c34da11f0 0025cebb12
commit d15e66ae93
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/cargo.bbclass
+1 -1
View File
@@ -9,7 +9,7 @@ inherit cargo_common
CARGO = "cargo" CARGO = "cargo"
# We need cargo to compile for the target # We need cargo to compile for the target
BASEDEPENDS_append_class-target = " cargo-native" BASEDEPENDS_append = " cargo-native"
# Ensure we get the right rust variant # Ensure we get the right rust variant
DEPENDS_append_class-target = " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}" DEPENDS_append_class-target = " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}"
recipes-devtools/cargo/cargo.inc
+3 -2
View File
@@ -45,6 +45,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG = "1"
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"
# When building cargo-native we don't have a built cargo to use so we must use # When building cargo-native we don't have cargo-native to use and depend on,
# the snapshot to bootstrap the build of cargo # so we must use the locally set up snapshot to bootstrap the build.
BASEDEPENDS_remove_class-native = "cargo-native"
CARGO_class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo" CARGO_class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo"