DEBUG

diff --git a/scripts/build/collect_symbols.sh b/scripts/build/collect_symbols.sh index af5ce48dc2..dc88bad9fa 100755 --- a/scripts/build/collect_symbols.sh +++ b/scripts/build/collect_symbols.sh @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 OR ISC set -ex -set -o pipefail +#set -o pipefail function find_rust_platform() { rustc -Vv | grep -E "^host" | perl -p -e 's/^host:\s*(\S*)/\1/' @@ -93,8 +93,10 @@ if [[ "${PLATFORM}" = *-msvc ]]; then VS_INSTALL_PATH="$("$(echo "${PFx86//\\/\/}//Microsoft Visual Studio/Installer/vswhere.exe")" | grep 'resolvedInstallationPath:' | sed -e 's/[^:]*: $.*$$/\1/')" DUMPBIN="$(ls -1 "${VS_INSTALL_PATH//\\/\/}"/VC/Tools/MSVC/*/bin/Hostx64/${MSVC_ARCH}/dumpbin.exe | tail -n 1)" - PATH="$(dirname "${DUMPBIN}")":"${PATH}" - dumpbin //EXPORTS //SYMBOLS ${LIBCRYPTO_PATH} | grep External | grep SECT1 | sed -e 's/.*External\s*|\s*$.*$$/\1/'| egrep '^\w' | sort | uniq | filter_symbols >"${SYMBOLS_FILE}" + PATH="$(dirname "${DUMPBIN/C:/\/c}")":"${PATH}" + dumpbin //EXPORTS //SYMBOLS "${LIBCRYPTO_PATH}" | grep External | grep SECT1 | sed -e 's/.*External\s*|\s*$.*$$/\1/'| grep -E '^\w' | sort | uniq | filter_symbols >"${SYMBOLS_FILE}" + echo "${PIPESTATUS[@]}" + exit 1 elif [[ "${LIBCRYPTO_PATH}" = *.dylib ]]; then nm --extern-only --defined-only -j "${LIBCRYPTO_PATH}" | grep -v "${REPO_ROOT}" | sort | uniq | filter_macho_symbols | filter_nm_symbols | filter_symbols >"${SYMBOLS_FILE}" elif [[ "${LIBCRYPTO_PATH}" = *.so || "${LIBCRYPTO_PATH}" = *.lib ]]; then
aws · Jul 17, 2024 · 5ff9525 · 5ff9525
1 parent 9c9db87
commit 5ff9525
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/scripts/build/collect_symbols.sh b/scripts/build/collect_symbols.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0 OR ISC
 
 set -ex
-set -o pipefail
+#set -o pipefail
 
 function find_rust_platform() {
   rustc -Vv | grep -E "^host" | perl -p -e 's/^host:\s*(\S*)/\1/'
@@ -93,8 +93,10 @@ if [[ "${PLATFORM}" = *-msvc ]]; then
   VS_INSTALL_PATH="$("$(echo "${PFx86//\\/\/}//Microsoft Visual Studio/Installer/vswhere.exe")" | grep 'resolvedInstallationPath:' | sed -e 's/[^:]*: \(.*\)$/\1/')"
 
   DUMPBIN="$(ls -1 "${VS_INSTALL_PATH//\\/\/}"/VC/Tools/MSVC/*/bin/Hostx64/${MSVC_ARCH}/dumpbin.exe | tail -n 1)"
-  PATH="$(dirname "${DUMPBIN}")":"${PATH}"
-  dumpbin //EXPORTS //SYMBOLS  ${LIBCRYPTO_PATH} | grep External | grep SECT1 | sed -e 's/.*External\s*|\s*\(.*\)$/\1/'| egrep '^\w' | sort | uniq | filter_symbols >"${SYMBOLS_FILE}"
+  PATH="$(dirname "${DUMPBIN/C:/\/c}")":"${PATH}"
+  dumpbin //EXPORTS //SYMBOLS  "${LIBCRYPTO_PATH}" | grep External | grep SECT1 | sed -e 's/.*External\s*|\s*\(.*\)$/\1/'| grep -E '^\w' | sort | uniq | filter_symbols >"${SYMBOLS_FILE}"
+  echo "${PIPESTATUS[@]}"
+  exit 1
 elif [[ "${LIBCRYPTO_PATH}" = *.dylib ]]; then
   nm --extern-only --defined-only -j  "${LIBCRYPTO_PATH}" | grep -v "${REPO_ROOT}" | sort | uniq | filter_macho_symbols | filter_nm_symbols |  filter_symbols >"${SYMBOLS_FILE}"
 elif [[ "${LIBCRYPTO_PATH}" = *.so || "${LIBCRYPTO_PATH}" = *.lib ]]; then