File tree Expand file tree Collapse file tree 1 file changed +9
-9
lines changed Expand file tree Collapse file tree 1 file changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -102,27 +102,27 @@ conda create -n arrow -q -y -c conda-forge ^
102102 thrift-cpp=0.11 ^
103103 boost-cpp
104104
105- call activate arrow
106-
107105set ARROW_LLVM_VERSION = 6.0.1
108106
109107if " %ARROW_BUILD_GANDIVA% " == " ON" (
110108 @ rem Install llvmdev in the toolchain if building gandiva.dll
111- conda install -q -y llvmdev=%ARROW_LLVM_VERSION% ^
112- clangdev=%ARROW_LLVM_VERSION% -c conda-forge || exit /B
109+ conda install -n arrow - q -y llvmdev=%ARROW_LLVM_VERSION% ^
110+ clangdev=%ARROW_LLVM_VERSION% -c conda-forge
113111)
114112
115- @ rem Use Boost from Anaconda
116- set BOOST_ROOT = %CONDA_PREFIX% \Library
117- set BOOST_LIBRARYDIR = %CONDA_PREFIX% \Library\lib
118-
119113if " %JOB% " == " Toolchain" (
120114 @ rem Install pre-built "toolchain" packages for faster builds
121- conda install -q -y -c conda-forge ^
115+ conda install -n arrow - q -y -c conda-forge ^
122116 --file=ci\conda_env_cpp.yml ^
123117 python=%PYTHON%
124118
125119 set ARROW_BUILD_TOOLCHAIN = %CONDA_PREFIX% \Library
126120)
127121
122+ call activate arrow
123+
124+ @ rem Use Boost from Anaconda
125+ set BOOST_ROOT = %CONDA_PREFIX% \Library
126+ set BOOST_LIBRARYDIR = %CONDA_PREFIX% \Library\lib
127+
128128call ci\cpp-msvc-build-main.bat
You can’t perform that action at this time.
0 commit comments