summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rust/rust.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rust/rust.inc')
-rw-r--r--meta/recipes-devtools/rust/rust.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc
index ecb057ad3b..aa067932fd 100644
--- a/meta/recipes-devtools/rust/rust.inc
+++ b/meta/recipes-devtools/rust/rust.inc
@@ -79,7 +79,7 @@ python do_configure() {
79 config = configparser.RawConfigParser() 79 config = configparser.RawConfigParser()
80 80
81 # [target.ARCH-poky-linux] 81 # [target.ARCH-poky-linux]
82 target_section = "target.{}".format(d.getVar('TARGET_SYS', True)) 82 target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS', True))
83 config.add_section(target_section) 83 config.add_section(target_section)
84 84
85 llvm_config = d.expand("${YOCTO_ALTERNATE_EXE_PATH}") 85 llvm_config = d.expand("${YOCTO_ALTERNATE_EXE_PATH}")
@@ -128,11 +128,11 @@ python do_configure() {
128 config.set("build", "vendor", e(True)) 128 config.set("build", "vendor", e(True))
129 129
130 if not "targets" in locals(): 130 if not "targets" in locals():
131 targets = [d.getVar("TARGET_SYS", True)] 131 targets = [d.getVar("RUST_TARGET_SYS", True)]
132 config.set("build", "target", e(targets)) 132 config.set("build", "target", e(targets))
133 133
134 if not "hosts" in locals(): 134 if not "hosts" in locals():
135 hosts = [d.getVar("HOST_SYS", True)] 135 hosts = [d.getVar("RUST_HOST_SYS", True)]
136 config.set("build", "host", e(hosts)) 136 config.set("build", "host", e(hosts))
137 137
138 # We can't use BUILD_SYS since that is something the rust snapshot knows 138 # We can't use BUILD_SYS since that is something the rust snapshot knows
@@ -181,10 +181,10 @@ do_compile () {
181 181
182rust_do_install () { 182rust_do_install () {
183 mkdir -p ${D}${bindir} 183 mkdir -p ${D}${bindir}
184 cp build/${HOST_SYS}/stage2/bin/* ${D}${bindir} 184 cp build/${RUST_HOST_SYS}/stage2/bin/* ${D}${bindir}
185 185
186 mkdir -p ${D}${libdir}/rustlib 186 mkdir -p ${D}${libdir}/rustlib
187 cp -pRd build/${HOST_SYS}/stage2/lib/* ${D}${libdir} 187 cp -pRd build/${RUST_HOST_SYS}/stage2/lib/* ${D}${libdir}
188 # Remove absolute symlink so bitbake doesn't complain 188 # Remove absolute symlink so bitbake doesn't complain
189 rm -f ${D}${libdir}/rustlib/src/rust 189 rm -f ${D}${libdir}/rustlib/src/rust
190} 190}