From 23b9ac934e9083fb839e238710598a5047868679 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 15 Dec 2014 15:58:40 -0500 Subject: [PATCH] rust: use a different INHIBIT_DEFAULT*_DEPS to avoid hardcoding real DEFAULT_DEPS --- classes/internal-rust-cross.bbclass | 6 ++---- classes/rust.bbclass | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/classes/internal-rust-cross.bbclass b/classes/internal-rust-cross.bbclass index 23c7df8..669b36a 100644 --- a/classes/internal-rust-cross.bbclass +++ b/classes/internal-rust-cross.bbclass @@ -1,10 +1,8 @@ inherit cross # Otherwise we'll depend on what we provide -INHIBIT_DEFAULT_DEPS = "1" - -# XXX: will this glibc be correctly parsed? (glibc doesn't provice a virtual/${TARGET_PREFIX}libc) -DEPENDS += "virtual/${TARGET_PREFIX}gcc rust-native glibc" +INHIBIT_DEFAULT_RUST_DEPS = "1" +DEPENDS += "rust-native" PROVIDES = "virtual/${TARGET_PREFIX}rust" PN = "rust-cross-${TARGET_ARCH}" diff --git a/classes/rust.bbclass b/classes/rust.bbclass index 234cad9..9bcb08d 100644 --- a/classes/rust.bbclass +++ b/classes/rust.bbclass @@ -7,7 +7,7 @@ def rust_base_dep(d): # Taken from meta/classes/base.bbclass `base_dep_prepend` and modified to # use rust instead of gcc deps = "" - if not d.getVar('INHIBIT_DEFAULT_DEPS'): + if not d.getVar('INHIBIT_DEFAULT_RUST_DEPS'): if (d.getVar('HOST_SYS', True) != d.getVar('BUILD_SYS', True)): deps += " virtual/${TARGET_PREFIX}rust" else: