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.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc
index f39228e3c0..008b2ce4a4 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('TARGET_SYS'))
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}")
@@ -90,7 +90,7 @@ python do_configure() {
90 90
91 # If we don't do this rust-native will compile it's own llvm for BUILD. 91 # If we don't do this rust-native will compile it's own llvm for BUILD.
92 # [target.${BUILD_ARCH}-unknown-linux-gnu] 92 # [target.${BUILD_ARCH}-unknown-linux-gnu]
93 target_section = "target.{}".format(d.getVar('SNAPSHOT_BUILD_SYS', True)) 93 target_section = "target.{}".format(d.getVar('SNAPSHOT_BUILD_SYS'))
94 config.add_section(target_section) 94 config.add_section(target_section)
95 95
96 config.set(target_section, "llvm-config", e(llvm_config)) 96 config.set(target_section, "llvm-config", e(llvm_config))
@@ -124,26 +124,26 @@ python do_configure() {
124 config.set("build", "vendor", e(True)) 124 config.set("build", "vendor", e(True))
125 125
126 if not "targets" in locals(): 126 if not "targets" in locals():
127 targets = [d.getVar("TARGET_SYS", True)] 127 targets = [d.getVar("TARGET_SYS")]
128 config.set("build", "target", e(targets)) 128 config.set("build", "target", e(targets))
129 129
130 if not "hosts" in locals(): 130 if not "hosts" in locals():
131 hosts = [d.getVar("HOST_SYS", True)] 131 hosts = [d.getVar("HOST_SYS")]
132 config.set("build", "host", e(hosts)) 132 config.set("build", "host", e(hosts))
133 133
134 # We can't use BUILD_SYS since that is something the rust snapshot knows 134 # We can't use BUILD_SYS since that is something the rust snapshot knows
135 # nothing about when trying to build some stage0 tools (like fabricate) 135 # nothing about when trying to build some stage0 tools (like fabricate)
136 config.set("build", "build", e(d.getVar("SNAPSHOT_BUILD_SYS", True))) 136 config.set("build", "build", e(d.getVar("SNAPSHOT_BUILD_SYS")))
137 137
138 # [install] 138 # [install]
139 config.add_section("install") 139 config.add_section("install")
140 # ./x.py install doesn't have any notion of "destdir" 140 # ./x.py install doesn't have any notion of "destdir"
141 # but we can prepend ${D} to all the directories instead 141 # but we can prepend ${D} to all the directories instead
142 config.set("install", "prefix", e(d.getVar("D", True) + d.getVar("prefix", True))) 142 config.set("install", "prefix", e(d.getVar("D") + d.getVar("prefix")))
143 config.set("install", "bindir", e(d.getVar("D", True) + d.getVar("bindir", True))) 143 config.set("install", "bindir", e(d.getVar("D") + d.getVar("bindir")))
144 config.set("install", "libdir", e(d.getVar("D", True) + d.getVar("libdir", True))) 144 config.set("install", "libdir", e(d.getVar("D") + d.getVar("libdir")))
145 config.set("install", "datadir", e(d.getVar("D", True) + d.getVar("datadir", True))) 145 config.set("install", "datadir", e(d.getVar("D") + d.getVar("datadir")))
146 config.set("install", "mandir", e(d.getVar("D", True) + d.getVar("mandir", True))) 146 config.set("install", "mandir", e(d.getVar("D") + d.getVar("mandir")))
147 147
148 with open("config.toml", "w") as f: 148 with open("config.toml", "w") as f:
149 f.write('changelog-seen = 2\n\n') 149 f.write('changelog-seen = 2\n\n')