Differential D7599 Diff 18281 files/Set-correct-libdir-in-bootstrap.patch

Changeset View

Standalone View

	From 8a67fae170f59c050577c7c82bc4844866c3371c Mon Sep 17 00:00:00 2001			From 99cc7efd4451f4f3468812199ba40366024bed4e Mon Sep 17 00:00:00 2001
	From: Fabio Forni <livingsilver94.solus@redaril.me>			From: Fabio Forni <livingsilver94.solus@redaril.me>
	Date: Wed, 5 Jun 2019 23:09:27 +0200			Date: Thu, 7 Nov 2019 19:15:05 +0100
	Subject: [PATCH] Set correct libdir in bootstrap			Subject: [PATCH] Set-correct-libdir-in-bootstrap

	---			---
	src/bootstrap/builder.rs \| 2 +-			src/bootstrap/builder.rs \| 3 +--
	1 file changed, 1 insertion(+), 1 deletion(-)			1 file changed, 1 insertion(+), 2 deletions(-)

	diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs			diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
	index 5224663..631a406 100644			index 5d586f0..e6428f2 100644
	--- a/src/bootstrap/builder.rs			--- a/src/bootstrap/builder.rs
	+++ b/src/bootstrap/builder.rs			+++ b/src/bootstrap/builder.rs
	@@ -604,7 +604,7 @@ impl<'a> Builder<'a> {			@@ -615,10 +615,9 @@ impl<'a> Builder<'a> {
	let lib = if compiler.stage >= 1 && config.libdir_relative().is_some() {			}
	builder.build.config.libdir_relative().unwrap()
	} else {			fn run(self, builder: &Builder<'_>) -> Interned<PathBuf> {
	- Path::new("lib")			- let lib = builder.sysroot_libdir_relative(self.compiler);
	+ Path::new("lib64")
	};
	let sysroot = builder			let sysroot = builder
	.sysroot(self.compiler)			.sysroot(self.compiler)
				- .join(lib)
				+ .join("lib64")
				.join("rustlib")
				.join(self.target)
				.join("lib");
	--			--
	2.21.0			2.23.0