Merge pull request #3637 from laytan/revert-clang++-detection

revert `$(llvm-config --bindir)/clang++` to get the cpp compiler
odin-lang · May 26, 2024 · 8421950 · 8421950
2 parents 149ae70 + 5027cfb
commit 8421950
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/build_odin.sh b/build_odin.sh
@@ -45,7 +45,13 @@ if [ -z "$LLVM_CONFIG" ]; then
 	fi
 fi
 
-: ${CXX=$($LLVM_CONFIG --bindir)/clang++}
+if [ -x "$(which clang++)" ]; then
+	: ${CXX="clang++"}
+elif [ -x "$($LLVM_CONFIG --bindir)/clang++" ]; then
+	: ${CXX=$($LLVM_CONFIG --bindir)/clang++}
+else
+	error "No clang++ command found. Set CXX to proceed."
+fi
 
 LLVM_VERSION="$($LLVM_CONFIG --version)"
 LLVM_VERSION_MAJOR="$(echo $LLVM_VERSION | awk -F. '{print $1}')"