<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/02bf4b5730ae7fa7d5641089facec22b4a8b3610">https://github.com/macports/macports-ports/commit/02bf4b5730ae7fa7d5641089facec22b4a8b3610</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 02bf4b5 rust: allow universal build; UsingTheRightCompiler
</span>02bf4b5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 02bf4b5730ae7fa7d5641089facec22b4a8b3610
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 25 19:13:29 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> rust: allow universal build; UsingTheRightCompiler
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/55962
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/55956
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> maintainer timeout
</span>---
lang/rust/Portfile | 163 ++++++++++++++++++-----
lang/rust/files/patch-src-librustc-llvm-lib.diff | 2 +-
2 files changed, 128 insertions(+), 37 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/Portfile b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c61040f..1fdb3dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=portfile:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
name rust
version 1.24.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories lang devel
platforms darwin
supported_archs i386 x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,49 +37,65 @@ distname ${name}c-${version}-src
</span>
patchfiles patch-src-librustc-llvm-lib.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set rust_platform ${build_arch}-apple-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruststd_version 1.23.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set rustc_version 1.23.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cargo_version 0.24.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set rust_platform i686-apple-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set architectures i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set architectures ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set architectures {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend architectures i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend architectures ${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set stage0(ruststd) rust-std-1.23.0-${rust_platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set stage0(rustc) rustc-1.23.0-${rust_platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set stage0(cargo) cargo-0.24.0-${rust_platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append ${stage0(ruststd)}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage0(rustc)}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage0(cargo)}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach arch ${architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append rust-std-${ruststd_version}-${arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rustc-${rustc_version}-${arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cargo-${cargo_version}-${arch}-apple-${os.platform}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
checksums ${distname}${extract.suffix} \
rmd160 e4c92648fbd3499dcc54c6efdce53d5cdde010c4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3ea53d45e8d2e9a41afb3340cf54b9745f845b552d802d607707cf04450761ef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3ea53d45e8d2e9a41afb3340cf54b9745f845b552d802d607707cf04450761ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 67512394
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage0(ruststd)}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rust-std-${ruststd_version}-i686-apple-${os.platform}${extract.suffix} \
</span> rmd160 2873bd63f74c1d225a0a3392bb8cfa5534679dc1 \
sha256 e454d4f5fd1e66f48d6ea8f102a96a15325cf969079f4485aab8e4486b96e2d8 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage0(rustc)}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 66640892 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rustc-${rustc_version}-i686-apple-${os.platform}${extract.suffix} \
</span> rmd160 e4622e6082c4666e06bc173ee669f8198661d04a \
sha256 618b0dea1e1563d22cb58c1d54344c096e7a4e2d138a17413a349a3edc753745 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage0(cargo)}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 48081807 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cargo-${cargo_version}-i686-apple-${os.platform}${extract.suffix} \
</span> rmd160 17458dce93eb7e644385bd82ecb511311765e5e6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6b7a0a97e0d87cca7b7a5e090d168be6cdbb03298381bece33df493447e17e76
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage0(ruststd)}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6b7a0a97e0d87cca7b7a5e090d168be6cdbb03298381bece33df493447e17e76 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3909191
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rust-std-${ruststd_version}-x86_64-apple-${os.platform}${extract.suffix} \
</span> rmd160 5b2d5f9e7ed73112fc970d5d74eef392b5c490a8 \
sha256 c2859aeb763edc07ec289a929c66f269373de67908d3a9be069868a8c103c833 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage0(rustc)}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 67553850 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rustc-${rustc_version}-x86_64-apple-${os.platform}${extract.suffix} \
</span> rmd160 f15d358053c4979a027299c68ba0dd8ca50df444 \
sha256 61d8774c6e348addc1e82fe598b5d007f30d3d8992d95f0530048236dedf4e0d \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage0(cargo)}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 49076336 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cargo-${cargo_version}-x86_64-apple-${os.platform}${extract.suffix} \
</span> rmd160 ac5eff8ae2489845f9761c275b03677a50309c1a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b6f7c662ea75a94f5a5e41c2fee95f09a5ba168429ac8cdd41f6ba2c78d1b07f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set stage0(dir) ${worksrcpath}/build/stage0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6f7c662ea75a94f5a5e41c2fee95f09a5ba168429ac8cdd41f6ba2c78d1b07f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4215369
</span>
pre-fetch {
if {${os.platform} eq "darwin" && ${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,26 +105,73 @@ pre-fetch {
</span> }
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${stage0(dir)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cp -r ${workpath}/${stage0(ruststd)}/rust-std-${rust_platform}/* ${stage0(dir)}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cp -r ${workpath}/${stage0(rustc)}/rustc/* ${stage0(dir)}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cp -r ${workpath}/${stage0(cargo)}/cargo/* ${stage0(dir)}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_root ${worksrcpath}/build/stage0-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${rust_root}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cp -r ${workpath}/rust-std-${ruststd_version}-${rust_platform}/rust-std-${rust_platform}/* ${rust_root}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cp -r ${workpath}/rustc-${rustc_version}-${rust_platform}/rustc/* ${rust_root}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cp -r ${workpath}/cargo-${cargo_version}-${rust_platform}/cargo/* ${rust_root}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --build=${rust_platform} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-vendor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-vendor \
</span> --default-linker=${configure.cc} \
--disable-codegen-tests \
--disable-docs \
--llvm-root=${prefix}/libexec/llvm-5.0 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --local-rust-root=${stage0(dir)} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --release-channel=stable \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --release-channel=stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_root ${worksrcpath}/build/stage0-${arch_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=${rust_platform} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --local-rust-root=${rust_root}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_root ${worksrcpath}/build/stage0-${arch_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=${rust_platform} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --local-rust-root=${rust_root}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach arch ${architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span> --set=target.${rust_platform}.cc=${configure.cc} \
--set=target.${rust_platform}.cxx=${configure.cxx} \
--set=target.${rust_platform}.linker=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the bootstrap call to rustc uses cc for the linker
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # place config file in the HOME directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${workpath}/.home/.cargo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set config [open ${workpath}/.home/.cargo/config w]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${config} "\[target.${rust_platform}\]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${config} "linker = \"${configure.cc}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${config}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.env RUSTC_SAVE_ANALYSIS=api
build.args VERBOSE=1 BOOTSTRAP_ARGS="-v -j${build.jobs}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,8 +180,15 @@ test.target check
</span> test.args VERBOSE=1
destroot.args VERBOSE=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch_name}-apple-${os.platform}
</span> file copy \
${worksrcpath}/build/${rust_platform}/stage1-std/${rust_platform}/release/deps/save-analysis \
${destroot}${prefix}/lib/rustlib/${rust_platform}/analysis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,6 +197,25 @@ post-destroot {
</span> xinstall -m 644 ${worksrcpath}/src/etc/ctags.rust \
${destroot}${prefix}/share/${name}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ merger-post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name ${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}-${arch}/build/${rust_platform}/stage1-std/${rust_platform}/release/deps/save-analysis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}-${arch}${prefix}/lib/rustlib/${rust_platform}/analysis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}-${arch}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}-${arch}/src/etc/ctags.rust \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}-${arch}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/files/patch-src-librustc-llvm-lib.diff b/lang/rust/files/patch-src-librustc-llvm-lib.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 71f416f..5700eb9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/files/patch-src-librustc-llvm-lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/files/patch-src-librustc-llvm-lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/librustc_llvm/lib.rs.orig 2018-01-15 17:44:30.000000000 +0400
+++ src/librustc_llvm/lib.rs 2018-01-16 02:36:38.000000000 +0400
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -429,3 +429,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -426,3 +426,5 @@
</span> }
}
}
</pre><pre style='margin:0'>
</pre>