[compiler-rt] 64b94eb - [sanitizer][symbolizer] Checkout zlib

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2023-08-15T23:22:37-07:00
New Revision: 64b94eb2e785eb47dc86e1265eda283df0f00258

URL: https://github.com/llvm/llvm-project/commit/64b94eb2e785eb47dc86e1265eda283df0f00258
DIFF: https://github.com/llvm/llvm-project/commit/64b94eb2e785eb47dc86e1265eda283df0f00258.diff

LOG: [sanitizer][symbolizer] Checkout zlib

And make build script incremental.

We will eventually convert the script into ExternalProject_Add.

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D158044

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh
index a5da88457f6d22..015b0fbf0bbc28 100755
--- a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh
+++ b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 #
-# Run as: CLANG=bin/clang ZLIB_SRC=src/zlib \
-#             build_symbolizer.sh runtime_build/lib/clang/4.0.0/lib/linux/
+# Run as: CLANG=bin/clang build_symbolizer.sh out.o
 # zlib can be downloaded from http://www.zlib.net.
 #
 # Script compiles self-contained object file with symbolization code and injects
@@ -36,22 +35,9 @@ COMPILER_RT_SRC=$(readlink -f ${SCRIPT_DIR}/../../../..)
 LLVM_SRC=${LLVM_SRC:-${COMPILER_RT_SRC}/../llvm}
 LLVM_SRC=$(readlink -f $LLVM_SRC)
 
-if [[ "$ZLIB_SRC" == ""  ||
-      ! -x "${ZLIB_SRC}/configure" ||
-      ! -f "${ZLIB_SRC}/zlib.h" ]]; then
-  echo "Missing or incomplete ZLIB_SRC"
-  exit 1
-fi
-ZLIB_SRC=$(readlink -f $ZLIB_SRC)
-
 CLANG="${CLANG:-`which clang`}"
 CLANG_DIR=$(readlink -f $(dirname "$CLANG"))
 
-rm -rf symbolizer
-BUILD_DIR=$(readlink -f ./symbolizer)
-mkdir -p $BUILD_DIR
-cd $BUILD_DIR
-
 CC=$CLANG_DIR/clang
 CXX=$CLANG_DIR/clang++
 TBLGEN=$CLANG_DIR/llvm-tblgen
@@ -66,6 +52,10 @@ for F in $CC $CXX $TBLGEN $LINK $OPT $AR; do
   fi
 done
 
+BUILD_DIR=${PWD}/symbolizer
+mkdir -p $BUILD_DIR
+cd $BUILD_DIR
+
 ZLIB_BUILD=${BUILD_DIR}/zlib
 LIBCXX_BUILD=${BUILD_DIR}/libcxx
 LLVM_BUILD=${BUILD_DIR}/llvm
@@ -83,9 +73,8 @@ FLAGS+=" -include ${SRC_DIR}/../sanitizer_redefine_builtins.h -DSANITIZER_COMMON
 LINKFLAGS="-fuse-ld=lld -target $TARGET_TRIPLE"
 
 # Build zlib.
-mkdir -p ${ZLIB_BUILD}
+[[ -d ${ZLIB_BUILD} ]] || git clone https://github.com/madler/zlib ${ZLIB_BUILD}
 cd ${ZLIB_BUILD}
-cp -r ${ZLIB_SRC}/* .
 AR="${AR}" CC="${CC}" CFLAGS="$FLAGS -Wno-deprecated-non-prototype" RANLIB=/bin/true ./configure --static
 make -j libz.a