|
@@ -83,7 +83,7 @@ python do_configure() {
|
|
|
config = configparser.RawConfigParser()
|
|
|
|
|
|
# [target.ARCH-poky-linux]
|
|
|
- host_section = "target.{}".format(d.getVar('RUST_HOST_SYS', True))
|
|
|
+ host_section = "target.{}".format(d.getVar('RUST_HOST_SYS'))
|
|
|
config.add_section(host_section)
|
|
|
|
|
|
llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}")
|
|
@@ -98,7 +98,7 @@ python do_configure() {
|
|
|
|
|
|
# If we don't do this rust-native will compile it's own llvm for BUILD.
|
|
|
# [target.${BUILD_ARCH}-unknown-linux-gnu]
|
|
|
- build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS', True))
|
|
|
+ build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS'))
|
|
|
if build_section != host_section:
|
|
|
config.add_section(build_section)
|
|
|
|
|
@@ -108,7 +108,7 @@ python do_configure() {
|
|
|
config.set(build_section, "cc", e(d.expand("${RUST_BUILD_CC}")))
|
|
|
config.set(build_section, "linker", e(d.expand("${RUST_BUILD_CCLD}")))
|
|
|
|
|
|
- target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS', True))
|
|
|
+ target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS'))
|
|
|
if target_section != host_section and target_section != build_section:
|
|
|
config.add_section(target_section)
|
|
|
|
|
@@ -154,26 +154,26 @@ python do_configure() {
|
|
|
config.set("build", "vendor", e(True))
|
|
|
|
|
|
if not "targets" in locals():
|
|
|
- targets = [d.getVar("RUST_TARGET_SYS", True)]
|
|
|
+ targets = [d.getVar("RUST_TARGET_SYS")]
|
|
|
config.set("build", "target", e(targets))
|
|
|
|
|
|
if not "hosts" in locals():
|
|
|
- hosts = [d.getVar("RUST_HOST_SYS", True)]
|
|
|
+ hosts = [d.getVar("RUST_HOST_SYS")]
|
|
|
config.set("build", "host", e(hosts))
|
|
|
|
|
|
# We can't use BUILD_SYS since that is something the rust snapshot knows
|
|
|
# nothing about when trying to build some stage0 tools (like fabricate)
|
|
|
- config.set("build", "build", e(d.getVar("RUST_BUILD_SYS", True)))
|
|
|
+ config.set("build", "build", e(d.getVar("RUST_BUILD_SYS")))
|
|
|
|
|
|
# [install]
|
|
|
config.add_section("install")
|
|
|
# ./x.py install doesn't have any notion of "destdir"
|
|
|
# but we can prepend ${D} to all the directories instead
|
|
|
- config.set("install", "prefix", e(d.getVar("D", True) + d.getVar("prefix", True)))
|
|
|
- config.set("install", "bindir", e(d.getVar("D", True) + d.getVar("bindir", True)))
|
|
|
- config.set("install", "libdir", e(d.getVar("D", True) + d.getVar("libdir", True)))
|
|
|
- config.set("install", "datadir", e(d.getVar("D", True) + d.getVar("datadir", True)))
|
|
|
- config.set("install", "mandir", e(d.getVar("D", True) + d.getVar("mandir", True)))
|
|
|
+ config.set("install", "prefix", e(d.getVar("D") + d.getVar("prefix")))
|
|
|
+ config.set("install", "bindir", e(d.getVar("D") + d.getVar("bindir")))
|
|
|
+ config.set("install", "libdir", e(d.getVar("D") + d.getVar("libdir")))
|
|
|
+ config.set("install", "datadir", e(d.getVar("D") + d.getVar("datadir")))
|
|
|
+ config.set("install", "mandir", e(d.getVar("D") + d.getVar("mandir")))
|
|
|
|
|
|
with open("config.toml", "w") as f:
|
|
|
f.write('changelog-seen = 2\n\n')
|