From 37936ec0eaa87097d698b17a03fc8eea8894d739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 19 Apr 2021 14:30:42 +0300 Subject: [PATCH] build-llvm: Install llvm-windres if available The current llvm main branch contains the tool llvm-windres; make sure to install and include it, if it exists. --- build-llvm.sh | 2 +- strip-llvm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-llvm.sh b/build-llvm.sh index 423ae07..054c6ca 100755 --- a/build-llvm.sh +++ b/build-llvm.sh @@ -208,7 +208,7 @@ cmake \ ${EXPLICIT_PROJECTS+-DLLVM_ENABLE_PROJECTS="clang;lld;lldb"} \ -DLLVM_TARGETS_TO_BUILD="ARM;AArch64;X86" \ -DLLVM_INSTALL_TOOLCHAIN_ONLY=$TOOLCHAIN_ONLY \ - -DLLVM_TOOLCHAIN_TOOLS="llvm-ar;llvm-ranlib;llvm-objdump;llvm-rc;llvm-cvtres;llvm-nm;llvm-strings;llvm-readobj;llvm-dlltool;llvm-pdbutil;llvm-objcopy;llvm-strip;llvm-cov;llvm-profdata;llvm-addr2line;llvm-symbolizer" \ + -DLLVM_TOOLCHAIN_TOOLS="llvm-ar;llvm-ranlib;llvm-objdump;llvm-rc;llvm-cvtres;llvm-nm;llvm-strings;llvm-readobj;llvm-dlltool;llvm-pdbutil;llvm-objcopy;llvm-strip;llvm-cov;llvm-profdata;llvm-addr2line;llvm-symbolizer;llvm-windres" \ ${HOST+-DLLVM_HOST_TRIPLE=$HOST} \ -DLLDB_INCLUDE_TESTS=OFF \ $CMAKEFLAGS \ diff --git a/strip-llvm.sh b/strip-llvm.sh index 89a41ba..9ac9d2e 100755 --- a/strip-llvm.sh +++ b/strip-llvm.sh @@ -77,7 +77,7 @@ for i in bugpoint c-index-test clang-* diagtool dsymutil git-clang-format hmapto rm -f $i fi ;; - llvm-ar|llvm-cvtres|llvm-dlltool|llvm-nm|llvm-objdump|llvm-ranlib|llvm-rc|llvm-readobj|llvm-strings|llvm-pdbutil|llvm-objcopy|llvm-strip|llvm-cov|llvm-profdata|llvm-addr2line|llvm-symbolizer|llvm-wrapper) + llvm-ar|llvm-cvtres|llvm-dlltool|llvm-nm|llvm-objdump|llvm-ranlib|llvm-rc|llvm-readobj|llvm-strings|llvm-pdbutil|llvm-objcopy|llvm-strip|llvm-cov|llvm-profdata|llvm-addr2line|llvm-symbolizer|llvm-wrapper|llvm-windres) ;; ld64.lld|wasm-ld) if [ -e $i ]; then