-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[rust] If $TMPDIR is unset, use $HOME/.tmp instead
This patch is needed because in sb2 the temp files written to /tmp by rustc are no longer available when the linker tries to use them. Work around the issue by setting $TMPDIR to $HOME/.tmp instead. If $TMPDIR is already set, that value is used as expected.
- Loading branch information
Showing
2 changed files
with
39 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs | ||
index dd9d277fb..160e472cf 100644 | ||
--- a/compiler/rustc_codegen_ssa/src/back/link.rs | ||
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs | ||
@@ -48,7 +48,7 @@ use std::ffi::OsString; | ||
use std::fs::{read, File, OpenOptions}; | ||
use std::io::{BufWriter, Write}; | ||
use std::ops::Deref; | ||
-use std::path::{Path, PathBuf}; | ||
+use std::path::{MAIN_SEPARATOR, Path, PathBuf}; | ||
use std::process::{ExitStatus, Output, Stdio}; | ||
use std::{env, fmt, fs, io, mem, str}; | ||
|
||
@@ -95,11 +95,24 @@ pub fn link_binary<'a>( | ||
}); | ||
|
||
if outputs.outputs.should_link() { | ||
+ let mut clear_tmp = false; | ||
+ if env::var_os("TMPDIR").is_none() && env::var_os("HOME").is_some() { | ||
+ let home_tmp = env::var_os("HOME").unwrap(); | ||
+ let home_tmp = format!("{}{}{}", home_tmp.to_string_lossy(), MAIN_SEPARATOR, ".tmp"); | ||
+ env::set_var("TMPDIR", &home_tmp); | ||
+ if !Path::new(&home_tmp).exists() { | ||
+ let _ = fs::create_dir_all(home_tmp); | ||
+ } | ||
+ clear_tmp = true; | ||
+ } | ||
let tmpdir = TempFileBuilder::new() | ||
.prefix("rustc") | ||
.tempdir() | ||
.unwrap_or_else(|error| sess.emit_fatal(errors::CreateTempDir { error })); | ||
let path = MaybeTempDir::new(tmpdir, sess.opts.cg.save_temps); | ||
+ if clear_tmp { | ||
+ env::remove_var("TMP"); | ||
+ } | ||
let output = out_filename( | ||
sess, | ||
crate_type, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters