Revert "Correct LLD detection when a specific version is needed for X-lang LTO"

This reverts commit b33cce1a6255564b88e0615eb5c7941bd7b15759.

diff --git a/genbindings.sh b/genbindings.sh
index 20533598bbab65e78ebe5795bf51c48d21fdbcc1..61fd24327b77c046654f132ee8d3cf5c0040b2f8 100755 (executable)
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -364,20 +364,10 @@ if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
                        LLD_LLVM_V="$(ld64.lld --version | awk '{ print substr($2, 0, 2); }')"
                fi
        fi
-       LLD_PFX=ld64.
 else
        CLANG_LLVM_V=$(clang --version | head -n1 | awk '{ print substr($4, 0, 2); }')
        if [ -x "$(which ld.lld)" ]; then
-               LLD_LLVM_V="$(ld.lld --version | awk '{ print $2; }')"
-               if [ "$LLD_LLVM_V" = "LLD" ]; then # eg if the output is "Debian LLD ..."
-                       LLD_LLVM_V="$(ld.lld --version | awk '{ print substr($3, 0, 2); }')"
-               else
-                       LLD_LLVM_V="$(ld.lld-$RUSTC_LLVM_V --version | awk '{ print substr($2, 0, 2); }')"
-               fi
-       fi
-       LLD_PFX=ld.
-       if [ $RUSTC_LLVM_V -lt "13" ]; then
-               LLD_PFX=
+               LLD_LLVM_V="$(ld.lld --version | awk '{ print substr($2, 0, 2); }')"
        fi
 fi
 
@@ -386,7 +376,7 @@ if [ "$CLANG_LLVM_V" = "$RUSTC_LLVM_V" ]; then
        CLANG=clang
        CLANGPP=clang++
        if [ "$LLD_LLVM_V" = "$CLANG_LLVM_V" ]; then
-               LLD=${LLD_PFX}lld
+               LLD=lld
        fi
 elif [ -x "$(which clang-$RUSTC_LLVM_V)" ]; then
        CLANG="$(which clang-$RUSTC_LLVM_V)"
@@ -397,13 +387,8 @@ elif [ -x "$(which clang-$RUSTC_LLVM_V)" ]; then
                unset CLANGPP
        fi
        if [ "$LLD_LLVM_V" != "$RUSTC_LLVM_V" ]; then
-               LLD="$(which ${LLD_PFX}lld-$RUSTC_LLVM_V || echo ${LLD_PFX}lld)"
-               LLD_LLVM_V="$($LLD --version | awk '{ print $2; }')"
-               if [ "$LLD_LLVM_V" = "LLD" ]; then # eg if the output is "Debian LLD ..."
-                       LLD_LLVM_V="$(${LLD_PFX}lld-$RUSTC_LLVM_V --version | awk '{ print substr($3, 0, 2); }')"
-               else
-                       LLD_LLVM_V="$(${LLD_PFX}lld-$RUSTC_LLVM_V --version | awk '{ print substr($2, 0, 2); }')"
-               fi
+               LLD="$(which lld-$RUSTC_LLVM_V || echo lld)"
+               LLD_LLVM_V="$(ld.$LLD --version | awk '{ print substr($2, 0, 2); }')"
                if [ "$LLD_LLVM_V" != "$RUSTC_LLVM_V" ]; then
                        echo "Could not find a workable version of lld, not using cross-language LTO"
                        unset LLD
@@ -528,7 +513,7 @@ if [ "$CLANGPP" != "" -a "$LLD" != "" ]; then
        CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release -- -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-march=sandybridge -C link-arg=-mcpu=sandybridge -C link-arg=-mtune=sandybridge
 
        if [ "$2" = "true" ]; then
-               $CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -O2 demo.cpp target/release/libldk.a -ldl
+               $CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=lld -O2 demo.cpp target/release/libldk.a -ldl
                strip ./a.out
                echo "C++ Bin size and runtime with cross-language LTO:"
                ls -lha a.out