From 5adfe8753f2a51ca90c9050c5e497a3d783fe94c Mon Sep 17 00:00:00 2001 From: Marc Rasi Date: Fri, 12 Apr 2019 18:05:10 -0700 Subject: [PATCH] restrict set of copied libtensorflow files --- utils/build-script-impl | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/utils/build-script-impl b/utils/build-script-impl index ae556d7aeefc5..4bf140f028519 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -2444,12 +2444,11 @@ for host in "${ALL_HOSTS[@]}"; do # problematic for overwriting/stripping symbols. Thus, write # permission is added here. for lib_name in tensorflow tensorflow_framework; do - lib="lib${lib_name}.so*" - dylib="lib${lib_name}*.dylib" - rm -f "${TF_LIB_DIR}/${lib}" - rm -f "${TF_LIB_DIR}/${dylib}" - find "${TENSORFLOW_HOST_LIB_DIR}" \( -name "${lib}" -o -name "${dylib}" \) -exec chmod +w {} + - find "${TENSORFLOW_HOST_LIB_DIR}" \( -name "${lib}" -o -name "${dylib}" \) -exec cp -p {} "${TF_LIB_DIR}" \; + lib=".*lib${lib_name}.so[0-9.]*" + dylib=".*lib${lib_name}[0-9.]*.dylib" + find "${TF_LIB_DIR}" \( -regex "${lib}" -o -regex "${dylib}" \) -exec rm -f {} \; + find "${TENSORFLOW_HOST_LIB_DIR}" \( -regex "${lib}" -o -regex "${dylib}" \) -exec chmod +w {} + + find "${TENSORFLOW_HOST_LIB_DIR}" \( -regex "${lib}" -o -regex "${dylib}" \) -exec cp -p {} "${TF_LIB_DIR}" \; done if [[ ! "${TENSORFLOW_TARGET_LIB_DIR}" ]] ; then @@ -3830,10 +3829,10 @@ for host in "${ALL_HOSTS[@]}"; do mkdir -p "${TF_DEST_DIR}" for lib_name in tensorflow tensorflow_framework do - lib="lib${lib_name}.so*" - dylib="lib${lib_name}*.dylib" - echo "${TF_LIBDIR}/${lib} => ${TF_DEST_DIR}" - find "${TF_LIBDIR}" \( -name "${lib}" -o -name "${dylib}" \) -exec cp -a {} "${TF_DEST_DIR}" \; + lib=".*lib${lib_name}.so[0-9.]*" + dylib=".*lib${lib_name}[0-9.]*.dylib" + find "${TF_LIBDIR}" \( -regex "${lib}" -o -regex "${dylib}" \) -exec echo "{} => ${TF_DEST_DIR}" \; + find "${TF_LIBDIR}" \( -regex "${lib}" -o -regex "${dylib}" \) -exec cp -a {} "${TF_DEST_DIR}" \; done continue ;;