]> git.lizzy.rs Git - rust.git/commitdiff
Update musl to 1.1.19 and add patch to fix tls issue
authorMarco A L Barbosa <malbarbo@gmail.com>
Thu, 5 Jul 2018 22:53:36 +0000 (19:53 -0300)
committerMarco A L Barbosa <malbarbo@gmail.com>
Thu, 5 Jul 2018 23:17:57 +0000 (20:17 -0300)
src/ci/docker/scripts/musl.sh

index f87ba8fe4e60e150613178a8157b170f33fc398c..4ca7389d6d1a53102eca067a43697f88250dbcd9 100644 (file)
@@ -32,11 +32,17 @@ shift
 
 export CFLAGS="-fPIC $CFLAGS"
 
-MUSL=musl-1.1.18
+# FIXME: remove the patch when upate to 1.1.20
+MUSL=musl-1.1.19
 
 # may have been downloaded in a previous run
 if [ ! -d $MUSL ]; then
   curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf -
+  # Patch to fix https://github.com/rust-lang/rust/issues/48967
+  cd $MUSL && \
+    curl "https://git.musl-libc.org/cgit/musl/patch/?id=610c5a8524c3d6cd3ac5a5f1231422e7648a3791" |\
+    patch -p1 && \
+    cd -
 fi
 
 cd $MUSL