diff options
Diffstat (limited to 'pkgs/development/compilers/rustc/patches/beta.patch')
| -rw-r--r-- | pkgs/development/compilers/rustc/patches/beta.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/pkgs/development/compilers/rustc/patches/beta.patch b/pkgs/development/compilers/rustc/patches/beta.patch new file mode 100644 index 00000000000..cffc773dd3e --- /dev/null +++ b/pkgs/development/compilers/rustc/patches/beta.patch @@ -0,0 +1,43 @@ +diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh +index ca59b1c..65ee7bf 100755 +--- a/src/etc/local_stage0.sh ++++ b/src/etc/local_stage0.sh +@@ -50,11 +50,6 @@ if [ -z $TARG_DIR ]; then + fi + + cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ +-cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ + + # do not fail if one of the above fails, as all we need is a working rustc! + exit 0 +diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs +index ed44bf8..2b84627 100644 +--- a/src/librustc_back/archive.rs ++++ b/src/librustc_back/archive.rs +@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>, + paths: &[&Path]) -> Output { + let ar = match *maybe_ar_prog { + Some(ref ar) => &ar[..], +- None => "ar" ++ None => "@arPath@" + }; + let mut cmd = Command::new(ar); + +diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs +index 3087a8e..578448f 100644 +--- a/src/librustc_trans/back/link.rs ++++ b/src/librustc_trans/back/link.rs +@@ -352,7 +352,7 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri + + pub fn get_cc_prog(sess: &Session) -> String { + match sess.opts.cg.linker { +- Some(ref linker) => return linker.to_string(), +- None => sess.target.target.options.linker.clone(), ++ Some(ref linker) => linker.to_string(), ++ None => "@ccPath@".to_string(), + } + } |