mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-12-01 01:36:09 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Use python3 in build if python2 is not found"

Browse Source 
This reverts commit b63fbe9d8a.

Sysroot scripts still use python2
This commit is contained in:
klzgrad 2020-10-03 16:11:27 +08:00
parent f1a4973601
commit c773f0ceb1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/build.sh
View File

@ -99,9 +99,9 @@ fi
rm -rf "./$out" rm -rf "./$out"
mkdir -p out mkdir -p out
python=$(which python2 2>/dev/null || which python 2>/dev/null || which python3 2>/dev/null) python2=$(which python2 2>/dev/null || which python 2>/dev/null)
export DEPOT_TOOLS_WIN_TOOLCHAIN=0 export DEPOT_TOOLS_WIN_TOOLCHAIN=0
./gn/out/gn gen "$out" --args="$flags $EXTRA_FLAGS" --script-executable=$python ./gn/out/gn gen "$out" --args="$flags $EXTRA_FLAGS" --script-executable=$python2
ninja -C "$out" naive ninja -C "$out" naive

4
src/get-clang.sh
View File

@ -26,8 +26,8 @@ if [ "$ARCH" = Linux ]; then
fi fi
# Clang # Clang
python=$(which python2 2>/dev/null || which python 2>/dev/null || which python3 2>/dev/null) python2=$(which python2 2>/dev/null || which python 2>/dev/null)
CLANG_REVISION=$($python tools/clang/scripts/update.py --print-revision) CLANG_REVISION=$($python2 tools/clang/scripts/update.py --print-revision)
CLANG_PATH="clang-$CLANG_REVISION.tgz" CLANG_PATH="clang-$CLANG_REVISION.tgz"
case "$ARCH" in case "$ARCH" in
Linux) clang_url="https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/$CLANG_PATH";; Linux) clang_url="https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/$CLANG_PATH";;