Differential D20792 Diff 59187 lang/rust/files/patch-src_bootstrap_native.rs

Changeset View

Standalone View

	Show All 18 Lines
	- return build_llvm_config			- return build_llvm_config
	- }			- }
	+ return build_llvm_config			+ return build_llvm_config
	}			}
	- }			- }

	let _folder = builder.fold_output(\|\| "llvm");			let _folder = builder.fold_output(\|\| "llvm");
	let descriptor = if emscripten { "Emscripten " } else { "" };			let descriptor = if emscripten { "Emscripten " } else { "" };
	@@ -218,6 +210,10 @@ impl Step for Llvm {
	}
	}

	+ if target == "powerpc64-unknown-freebsd" {
	+ cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath=/usr/local/lib/%CC% -L/usr/local/lib/%CC%");
	+ }
	+
	// http://llvm.org/docs/HowToCrossCompileLLVM.html
	if target != builder.config.build && !emscripten {
	builder.ensure(Llvm {
	@@ -283,9 +279,7 @@ impl Step for Llvm {			@@ -283,9 +279,7 @@ impl Step for Llvm {

	cfg.build();			cfg.build();

	- if let Some(llvm_commit) = llvm_info.sha() {			- if let Some(llvm_commit) = llvm_info.sha() {
	- t!(fs::write(&done_stamp, llvm_commit));			- t!(fs::write(&done_stamp, llvm_commit));
	- }			- }
	+ t!(fs::write(&done_stamp, "done building LLVM"));			+ t!(fs::write(&done_stamp, "done building LLVM"));

	build_llvm_config			build_llvm_config
	}			}