File tree Expand file tree Collapse file tree 3 files changed +21
-14
lines changed Expand file tree Collapse file tree 3 files changed +21
-14
lines changed Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ if [[ "$1" == "--only-rebuild-pybind11" ]]; then
1717 echo " Skipping Python requirements."
1818else
1919 echo " Installing requirements and Python package and cleaning up."
20- pip install -r py/requirements.txt
21- pip install --force-reinstall -e ./py
20+ pip3 install -r py/requirements.txt
21+ pip3 install --force-reinstall -e ./py
2222fi
2323
2424echo " Validating installation."
25- python -c " import evergreen; print('Evergreen imports successfully!')"
25+ python3 -c " import evergreen; print('Evergreen imports successfully!')"
Original file line number Diff line number Diff line change 1+ #! /usr/bin/env bash
2+
13set -e
24
35cc_standard=20
46
5- repo_root=$( pwd)
7+ repo_root=$( cd -- " $( dirname -- " ${BASH_SOURCE[0]} " ) " & > /dev/null && pwd )
8+ deps_dir=" ${repo_root} /third_party"
9+ build_dir=" ${repo_root} /build"
610
711# skip dependencies if specified
812if [[ " $1 " == " --skip-deps" ]]; then
913 echo " Skipping third-party dependencies build..."
1014else
1115 echo " Updating submodules..."
12- git submodule update --init --recursive
16+ (cd " ${repo_root} " && git submodule update --init --recursive)
1317 echo " Building third-party dependencies..."
14- cd third_party
15- CC=clang CXX=clang++ ./build_deps.sh
16- cd " $repo_root "
18+ (cd " ${deps_dir} " && CC=clang CXX=clang++ ./build_deps.sh)
1719fi
1820
19- mkdir -p build
20- cd build
21+
22+
2123echo " Configuring build..."
22- CC=clang CXX=clang++ cmake \
24+ (mkdir -p " ${build_dir} " \
25+ && cd " ${build_dir} " \
26+ && CC=clang CXX=clang++ cmake \
2327 -DCMAKE_CXX_STANDARD=" ${cc_standard} " \
2428 -DCMAKE_INSTALL_PREFIX=" ${repo_root} /install" \
2529 -DCMAKE_BUILD_TYPE=Debug \
2630 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
2731 -GNinja \
28- ..
32+ ..)
Original file line number Diff line number Diff line change 1+ # /usr/bin/env bash
2+
13set -e
24
35isset () { [[ $( eval echo " \$ {${1} +1}" ) ]]; }
@@ -18,7 +20,7 @@ if isunset build_folder_name; then
1820 build_folder_name=" build"
1921fi
2022
21- python_exec_prefix=$( python -c " import sys; print(sys.exec_prefix)" )
23+ python_exec_prefix=$( python3 -c " import sys; print(sys.exec_prefix)" )
2224
2325abseil_install_dir=" ${third_party_root} /build_deps/abseil-cpp"
2426boost_install_dir=" ${third_party_root} /build_deps/boost"
@@ -103,6 +105,7 @@ cmake \
103105 -DCMAKE_CXX_STANDARD=" ${cc_standard} " \
104106 -DCMAKE_INSTALL_PREFIX=" ${third_party_root} /build_deps/libzmq" \
105107 -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
108+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
106109 -G " Ninja" \
107110 ..
108111cmake --build . --parallel " ${parallelism} " --target install
@@ -119,4 +122,4 @@ cmake \
119122 -G " Ninja" \
120123 ..
121124cmake --build . --parallel " ${parallelism} " --target install
122- cd " ${third_party_root} "
125+ cd " ${third_party_root} "
You can’t perform that action at this time.
0 commit comments