From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Mon, 20 Dec 2021 09:38:14 +0000 (+0000)
Subject: Merge pull request #52 from TheBlueMatt/main
X-Git-Tag: v0.0.104.0^0
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=commitdiff_plain;h=1bb5ae1b34aeb74009b7b4b5ebefc957cddc30a6;hp=dd5bf474af6c806b20c26f4f2b751f3226a94dfd

Merge pull request #52 from TheBlueMatt/main

Correct non-default lld version passing
---

diff --git a/genbindings.sh b/genbindings.sh
index 2053359..44491f8 100755
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -364,7 +364,6 @@ 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
@@ -372,13 +371,9 @@ else
 		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); }')"
+			LLD_LLVM_V="$(ld.lld --version | awk '{ print substr($2, 0, 2); }')"
 		fi
 	fi
-	LLD_PFX=ld.
-	if [ $RUSTC_LLVM_V -lt "13" ]; then
-		LLD_PFX=
-	fi
 fi
 
 
@@ -386,7 +381,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,12 +392,13 @@ 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; }')"
+		LLD="lld"
+		[ -x "$(which lld-$RUSTC_LLVM_V)" ] && LLD="lld-$RUSTC_LLVM_V"
+		LLD_LLVM_V="$(ld.lld-$RUSTC_LLVM_V --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); }')"
+			LLD_LLVM_V="$(ld.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); }')"
+			LLD_LLVM_V="$(ld.lld-$RUSTC_LLVM_V --version | awk '{ print substr($2, 0, 2); }')"
 		fi
 		if [ "$LLD_LLVM_V" != "$RUSTC_LLVM_V" ]; then
 			echo "Could not find a workable version of lld, not using cross-language LTO"