From 3441dc931f4a9ad517f3393e7f8132d8b4cae729 Mon Sep 17 00:00:00 2001 From: Anton Lapounov Date: Tue, 26 Jan 2021 04:51:20 -0800 Subject: [PATCH] Another path fix --- src/coreclr/Tools/aot/ObjWriter/build.cmd | 6 +++--- src/coreclr/Tools/aot/ObjWriter/build.sh | 0 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/coreclr/Tools/aot/ObjWriter/build.sh diff --git a/src/coreclr/Tools/aot/ObjWriter/build.cmd b/src/coreclr/Tools/aot/ObjWriter/build.cmd index 91255714cf2e..4cfd10241802 100644 --- a/src/coreclr/Tools/aot/ObjWriter/build.cmd +++ b/src/coreclr/Tools/aot/ObjWriter/build.cmd @@ -19,10 +19,10 @@ if %ErrorLevel% geq 8 exit /b %ErrorLevel% if not exist build mkdir build cd build || exit /b 1 -:: Evaluate the output from set-cmake-path.ps1 -for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy ByPass "& ""%2\eng\native\set-cmake-path.ps1"""') do %%a +:: Set CMakePath by evaluating the output from set-cmake-path.ps1 +call "%2src\coreclr\setup_vs_tools.cmd" || exit /b 1 +for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy ByPass "& ""%2eng\native\set-cmake-path.ps1"""') do %%a echo Using CMake at "%CMakePath%" -if "%CMakePath%"=="" exit /b 1 "%CMakePath%" ../ -DCMAKE_BUILD_TYPE=Release -DLLVM_OPTIMIZED_TABLEGEN=1 -DHAVE_POSIX_SPAWN=0 -DLLVM_ENABLE_PIC=1 -DLLVM_BUILD_TESTS=0 -DLLVM_ENABLE_DOXYGEN=0 -DLLVM_INCLUDE_DOCS=0 -DLLVM_INCLUDE_TESTS=0 -DLLVM_TARGETS_TO_BUILD="ARM;X86;AArch64" -DCMAKE_INSTALL_PREFIX=install || exit /b 1 "%CMakePath%" --build . -j 10 --config Release --target install || exit /b 1 diff --git a/src/coreclr/Tools/aot/ObjWriter/build.sh b/src/coreclr/Tools/aot/ObjWriter/build.sh old mode 100644 new mode 100755