Skip to content

Commit 537d11a

Browse files
committed
Remove deleting abseil-cpp under protobuf as it doesn't exist anymore in 33.1
1 parent e249724 commit 537d11a

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

buildscripts/make_dependencies.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ del protobuf.zip
3030
powershell -command "$ProgressPreference = 'SilentlyContinue'; $ErrorActionPreference = 'stop'; & { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; iwr https://github.com/abseil/abseil-cpp/archive/refs/tags/%ABSL_VERSION%.zip -OutFile absl.zip }" || exit /b 1
3131
powershell -command "$ErrorActionPreference = 'stop'; & { Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory('absl.zip', '.') }" || exit /b 1
3232
del absl.zip
33-
rmdir protobuf-%PROTOBUF_VER%\third_party\abseil-cpp
3433
move abseil-cpp-%ABSL_VERSION% protobuf-%PROTOBUF_VER%\third_party\abseil-cpp
3534
mkdir protobuf-%PROTOBUF_VER%\build
3635
pushd protobuf-%PROTOBUF_VER%\build

buildscripts/make_dependencies.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ else
3333
if [[ ! -d "protobuf-${PROTOBUF_VERSION}" ]]; then
3434
curl -Ls "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz" | tar xz
3535
curl -Ls "https://github.com/abseil/abseil-cpp/archive/refs/tags/${ABSL_VERSION}.tar.gz" | tar xz
36-
rmdir "protobuf-$PROTOBUF_VERSION/third_party/abseil-cpp"
3736
mv "abseil-cpp-$ABSL_VERSION" "protobuf-$PROTOBUF_VERSION/third_party/abseil-cpp"
3837
fi
3938
# the same source dir is used for 32 and 64 bit builds, so we need to clean stale data first

0 commit comments

Comments
 (0)