From 74a616a9658d02cc4b31e1c0346d325d89c34a7e Mon Sep 17 00:00:00 2001
From: Sebastian Ullrich <sebasti@nullri.ch>
Date: Mon, 15 Nov 2021 15:47:50 +0100
Subject: [PATCH] chore: final cleanup?

---
 script/prepare-llvm-linux.sh | 4 ++--
 script/prepare-llvm-macos.sh | 4 ++--
 script/prepare-llvm-mingw.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/prepare-llvm-linux.sh b/script/prepare-llvm-linux.sh
index 8763ea4ed5..9e5b4f364f 100755
--- a/script/prepare-llvm-linux.sh
+++ b/script/prepare-llvm-linux.sh
@@ -12,9 +12,9 @@ set -uo pipefail
 mkdir -p stage1/{bin,lib,lib/glibc,include/clang}
 CP="cp -d"  # preserve symlinks
 # a C compiler!
-$CP $(realpath llvm/bin/clang) stage1/bin/clang
+cp -L llvm/bin/clang stage1/bin/
 # a linker!
-$CP llvm/bin/{ld.lld,lld} stage1/bin/
+cp -L llvm/bin/ld.lld stage1/bin/
 # dependencies of the above
 $CP llvm/lib/lib{clang-cpp,LLVM}*.so* stage1/lib/
 $CP $ZLIB/lib/libz.so* stage1/lib/
diff --git a/script/prepare-llvm-macos.sh b/script/prepare-llvm-macos.sh
index b4c413a590..e1a4a312fb 100755
--- a/script/prepare-llvm-macos.sh
+++ b/script/prepare-llvm-macos.sh
@@ -13,9 +13,9 @@ SDK=$(xcrun --show-sdk-path)
 mkdir -p stage1/{bin,lib/libc,include/clang}
 CP="gcp -d"  # preserve symlinks
 # a C compiler!
-$CP $(grealpath llvm/bin/clang) stage1/bin/clang
+gcp -L llvm/bin/clang stage1/bin/
 # a linker!
-gcp llvm/bin/ld64.lld stage1/bin/
+gcp -L llvm/bin/ld64.lld stage1/bin/
 # dependencies of the above
 $CP llvm/lib/lib{clang-cpp,LLVM}.dylib stage1/lib/
 #find stage1 -type f -exec strip --strip-unneeded '{}' \; 2> /dev/null
diff --git a/script/prepare-llvm-mingw.sh b/script/prepare-llvm-mingw.sh
index cc28dfa35d..4c6f85aa65 100644
--- a/script/prepare-llvm-mingw.sh
+++ b/script/prepare-llvm-mingw.sh
@@ -16,7 +16,7 @@ cp llvm/bin/clang stage1/bin/
 # a linker!
 cp llvm/bin/{ld.lld,lld} stage1/bin/
 # dependencies of the above
-cp $(ldd llvm/bin/{clang,lld}.exe | cut -f3 -d' ' --only-delimited | grep llvm) stage1/bin
+cp $(ldd llvm/bin/{clang,lld}.exe | cut -f3 -d' ' --only-delimited | grep -E 'llvm|clang64') stage1/bin
 # lean.h dependencies
 cp llvm/lib/clang/*/include/{std*,__std*,limits}.h stage1/include/clang
 # single Windows dependency