JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rustcMaster: Update to a more recent commit

Browse Source
This commit is contained in:
Ricardo M. Correia 2014-09-06 02:52:39 +02:00
parent 007be9f34c
commit 7068828389
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/rustc/hardcode_paths.patch
View File

@ -2,7 +2,7 @@ diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index 7a3e912..ced75fa 100644 index 7a3e912..ced75fa 100644
--- a/src/librustc/back/link.rs --- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs
@@ -766,24 +766,15 @@ pub fn output_lib_filename(id: &CrateId) -> String { @@ -856,24 +856,15 @@
pub fn get_cc_prog(sess: &Session) -> String { pub fn get_cc_prog(sess: &Session) -> String {
match sess.opts.cg.linker { match sess.opts.cg.linker {
@ -15,9 +15,9 @@ index 7a3e912..ced75fa 100644
- // In the future, FreeBSD will use clang as default compiler. - // In the future, FreeBSD will use clang as default compiler.
- // It would be flexible to use cc (system's default C compiler) - // It would be flexible to use cc (system's default C compiler)
- // instead of hard-coded gcc. - // instead of hard-coded gcc.
- // For win32, there is no cc command, so we add a condition to make it use gcc. - // For Windows, there is no cc command, so we add a condition to make it use gcc.
- match sess.targ_cfg.os { - match sess.targ_cfg.os {
- abi::OsWin32 => "gcc", - abi::OsWindows => "gcc",
- _ => "cc", - _ => "cc",
- }.to_string() - }.to_string()
} }

18
pkgs/development/compilers/rustc/head.nix
View File

@ -16,19 +16,19 @@ assert stdenv.gcc.gcc != null;
*/ */
with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-7a25cf3f3"; }); with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-79a5448f4"; });
let snapshot = if stdenv.system == "i686-linux" let snapshot = if stdenv.system == "i686-linux"
then "a5e1bb723020ac35173d49600e76b0935e257a6a" then "6f5464c9ab191d93bfea0894ca7c6f90c3506f2b"
else if stdenv.system == "x86_64-linux" else if stdenv.system == "x86_64-linux"
then "1a2407df17442d93d1c34c916269a345658045d7" then "72c92895fa9a1dba7880073f2b2b5d0e3e1a2ab6"
else if stdenv.system == "i686-darwin" else if stdenv.system == "i686-darwin"
then "6648fa88e41ad7c0991a085366e36d56005873ca" then "545fc45a0071142714639c6be377e6d308c3a4e1"
else if stdenv.system == "x86_64-darwin" else if stdenv.system == "x86_64-darwin"
then "71b2d1dfd0abe1052908dc091e098ed22cf272c6" then "8b44fbbbd1ba519d2e83d0d5ce1f6053d3cab8c6"
else abort "no-snapshot for platform ${stdenv.system}"; else abort "no-snapshot for platform ${stdenv.system}";
snapshotDate = "2014-07-17"; snapshotDate = "2014-09-10";
snapshotRev = "9fc8394"; snapshotRev = "6faa4f3";
snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2";
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -38,8 +38,8 @@ in stdenv.mkDerivation {
src = fetchgit { src = fetchgit {
url = https://github.com/rust-lang/rust; url = https://github.com/rust-lang/rust;
rev = "7a25cf3f30fa5fae2e868fa910ecc850f5e9ee65"; rev = "79a5448f41dcc6ab52663105a6b02fc5af4c503e";
sha256 = "1hx8vd4gn5plbdvr0zvdvqyw9x9r2vbmh112h2f5d2xxsf9p7rf1"; sha256 = "0v2ahwgb1ls3g4ch6005azjmfh8bs0v0nbmmfpn53zgiiywad2ji";
}; };
# We need rust to build rust. If we don't provide it, configure will try to download it. # We need rust to build rust. If we don't provide it, configure will try to download it.

7
pkgs/development/compilers/rustc/local_stage0.patch
View File

@ -2,12 +2,15 @@ diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
index e78f231..6b6773b 100755 index e78f231..6b6773b 100755
--- a/src/etc/local_stage0.sh --- a/src/etc/local_stage0.sh
+++ b/src/etc/local_stage0.sh +++ b/src/etc/local_stage0.sh
@@ -53,8 +53,3 @@ if [ -z $TARG_DIR ]; then @@ -53,11 +53,6 @@
fi fi
cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ 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}/${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}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}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}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${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