Merge pull request #9032 from Rmys/master

rust rebuild
This commit is contained in:
Rmys
2021-02-25 14:05:57 +03:00
committed by GitHub
2 changed files with 8 additions and 8 deletions
+7 -7
View File
@@ -22,19 +22,19 @@ WorkDir = "rustc-%s-src" %get.srcVERSION()
#At phase 2, rust will be built again with this newly built rust. #At phase 2, rust will be built again with this newly built rust.
#Before phase 2, the lines below will be commented out. #Before phase 2, the lines below will be commented out.
RustBinDir = "rust-%s-x86_64-unknown-linux-gnu" %get.srcVERSION() #RustBinDir = "rust-%s-x86_64-unknown-linux-gnu" %get.srcVERSION()
RustcDir = "%s/rustbin" %get.workDIR() #RustcDir = "%s/rustbin" %get.workDIR()
################################################################# #################################################################
def build(): def build():
#İkinci aşamada bu satırlar da yoruma çevrilecek. #İkinci aşamada bu satırlar da yoruma çevrilecek.
#At phase 2, these lines also will be commented out. #At phase 2, these lines also will be commented out.
shelltools.cd(RustBinDir) #shelltools.cd(RustBinDir)
shelltools.system("./install.sh --prefix=%s --without=rust-docs" %RustcDir) #shelltools.system("./install.sh --prefix=%s --without=rust-docs" %RustcDir)
shelltools.cd("..") #shelltools.cd("..")
pisitools.dosed("config.toml", "/usr/bin/cargo", RustcDir+"/bin/cargo") #pisitools.dosed("config.toml", "/usr/bin/cargo", RustcDir+"/bin/cargo")
pisitools.dosed("config.toml", "/usr/bin/rustc", RustcDir+"/bin/rustc") #pisitools.dosed("config.toml", "/usr/bin/rustc", RustcDir+"/bin/rustc")
#################################################### ####################################################
shelltools.export("LC_ALL", "en_US.UTF-8") shelltools.export("LC_ALL", "en_US.UTF-8")
+1 -1
View File
@@ -20,7 +20,7 @@
<AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile> <AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
<BuildDependencies> <BuildDependencies>
<!-- <Dependency>rust</Dependency> --> <Dependency>rust</Dependency>
<Dependency>perl</Dependency> <Dependency>perl</Dependency>
<Dependency versionFrom="11.1.0">llvm</Dependency> <Dependency versionFrom="11.1.0">llvm</Dependency>
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>