boringssl updates

couchbase · Oct 25, 2023 · 16c931d · 16c931d
1 parent 7d362bf
commit 16c931d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/bin/build_boringssl b/bin/build_boringssl
@@ -14,9 +14,6 @@ BORINGSSL_INCLUDE_DIR=$BORINGSSL_OUTPUT_DIR/include
 
 cd $BORINGSSL_SRC_DIR
 
-rm -rf build
-mkdir -p build
-cd build
 echo "Starting initial build phase."
 $BORINGSSL_CMAKE_EXE \
     -G"${BORINGSSL_CMAKE_GENERATOR}" \
@@ -34,6 +31,8 @@ if [ -n "$BORINGSSL_PREFIX" ]; then
     go run read_symbols.go $BORINGSSL_BUILD_DIR/ssl/libssl.a > $BORINGSSL_OUTPUT_DIR/symbols.txt
     go run read_symbols.go $BORINGSSL_BUILD_DIR/crypto/libcrypto.a >> $BORINGSSL_OUTPUT_DIR/symbols.txt
 
+    rm -rf $BORINGSSL_BUILD_DIR
+
     echo "Starting build phase with symbol prefixing."
     $BORINGSSL_CMAKE_EXE \
         -G"${BORINGSSL_CMAKE_GENERATOR}" \

diff --git a/bin/build_boringssl_win.bat b/bin/build_boringssl_win.bat
@@ -24,8 +24,6 @@ set BORINGSSL_INCLUDE_DIR=%BORINGSSL_OUTPUT_DIR%\include
 
 cd %BORINGSSL_SRC_DIR%
 
-rd /S /Q build
-md build
 @echo "Starting initial build phase."
 
 %BORINGSSL_CMAKE_EXE% ^
@@ -90,6 +88,8 @@ if [%BORINGSSL_PREFIX%] NEQ [] (
         move "%BORINGSSL_OUTPUT_DIR%\symbols_parsed.txt" "%BORINGSSL_OUTPUT_DIR%\symbols.txt"
     )
 
+    rd /S /Q "%BORINGSSL_BUILD_DIR%"
+
     @echo "Starting build phase with symbol prefixing."
     %BORINGSSL_CMAKE_EXE% ^
           -G %BORINGSSL_CMAKE_GENERATOR% ^