Drop copyright notice from musl-toolchain

[rust.git] / src / ci / docker / scripts / musl-toolchain.sh

diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh
index db609a8666f3049eecc7a235176ea6bc3aeaf9e3..00b6a113da10519622aa36795ff36b38c7afd875 100644 (file)
--- a/src/ci/docker/scripts/musl-toolchain.sh
+++ b/src/ci/docker/scripts/musl-toolchain.sh
@@ -1,13 +1,3 @@
-# Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-# file at the top-level directory of this distribution and at
-# http://rust-lang.org/COPYRIGHT.
-#
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
-
 set -ex
 
 hide_output() {
@@ -28,6 +18,10 @@ exit 1
 }
 
 TARGET=$1
+#ARCH=$1
+#TARGET=linux-musl-$ARCH
+ARCH=x86_64
+
 OUTPUT=/usr/local
 shift
 
@@ -37,12 +31,18 @@ cd musl-cross-make
 hide_output make -j$(nproc) TARGET=$TARGET
 hide_output make install TARGET=$TARGET OUTPUT=$OUTPUT
 
-cd ..
+cd -
+
+# Make musl binaries executable
+
+ln -s $OUTPUT/$TARGET/lib/libc.so /lib/ld-musl-$ARCH.so.1
+echo $OUTPUT/$TARGET/lib >> /etc/ld-musl-$ARCH.path
+
 
 export CC=$TARGET-gcc
 export CXX=$TARGET-g++
 
-LLVM=60
+LLVM=70
 
 # may have been downloaded in a previous run
 if [ ! -d libunwind-release_$LLVM ]; then
@@ -62,5 +62,5 @@ cmake ../libunwind-release_$LLVM \
 
 hide_output make -j$(nproc)
 cp lib/libunwind.a $OUTPUT/$TARGET/lib
-cd ../ && rm -rf libunwind-build
+cd - && rm -rf libunwind-build