From a7a188da76a0944fe116b7af9a753bc54c63cebf Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 22 Mar 2022 18:35:06 +0800 Subject: [PATCH] windows: work around -DLLVM_BUILD_TOOLS=OFF not disabling llvm-lto --- windows/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/windows/default.nix b/windows/default.nix index d1db0e32..19b4ab26 100644 --- a/windows/default.nix +++ b/windows/default.nix @@ -28,6 +28,8 @@ in mkdir clang tar xf ${src-clang} -C clang --strip-components=1 cd llvm + # build of llvm-lto fails and -DLLVM_BUILD_TOOLS=OFF does not disable it reliably because cmake + rm -rf tools/lto ''; patches = [ ../llvm/llvm-future-riscv-abi.diff ]; configurePhase = @@ -46,19 +48,15 @@ in mkdir build cd build - wine64 cmake .. -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_UNWIND_TABLES=OFF -DLLVM_ENABLE_THREADS=OFF -DLLVM_TARGETS_TO_BUILD=X86\;ARM\;RISCV -DLLVM_LINK_LLVM_DYLIB=OFF -DLLVM_ENABLE_FFI=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_INSTALL_PREFIX=$out + wine64 cmake .. -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_UNWIND_TABLES=OFF -DLLVM_ENABLE_THREADS=OFF -DLLVM_TARGETS_TO_BUILD=X86\;ARM\;RISCV -DLLVM_LINK_LLVM_DYLIB=OFF -DLLVM_ENABLE_FFI=OFF -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_INSTALL_PREFIX=$out ''; buildPhase = '' wine64 ninja - wine64 ninja llvm-config - wine64 ninja llvm-as ''; installPhase = '' wine64 ninja install - cp bin/llvm-config.exe $out/bin - cp bin/llvm-as.exe $out/bin ''; }; }