Libsystem-1252.250.1.tar.gz

[apple/libsystem.git] / xcodescripts / linker_arguments.sh

diff --git a/xcodescripts/linker_arguments.sh b/xcodescripts/linker_arguments.sh
index ea75f9fef30e60a83e85e24ecc2b6c7cdebbe361..6be6cd70b3abd4a7ee328f4135fe3a54b3cc5de8 100755 (executable)
--- a/xcodescripts/linker_arguments.sh
+++ b/xcodescripts/linker_arguments.sh
@@ -47,11 +47,15 @@ for arch in ${ARCHS}; do
 
        # Strip away variant information to do presence checks
        # non-normal variants can always link against normal clients
-       cd ${LSYS} && ls lib*.dylib | sed -E -e 's/_(debug|profile|static)\././' | while read l; do
-           xcrun -sdk "${SDKROOT}" lipo "${LSYS}/${l}" -verify_arch "${arch}" 2>/dev/null
-           if [ $? -eq 0 ]; then
-               echo "${l}"
-           fi
+       cd ${LSYS} && ls lib*.{dylib,tbd,api,spi} | sed -E -e 's/_(debug|profile|static)\././' | while read l; do
+               if [ "${l: -6}" == ".dylib" ]; then
+                       xcrun -sdk "${SDKROOT}" lipo "${LSYS}/${l}" -verify_arch "${arch}" 2>/dev/null
+               else
+                       xcrun -sdk "${SDKROOT}" tapi archive "${LSYS}/${l}" --verify-arch "${arch}" 2>/dev/null
+               fi
+               if [ $? -eq 0 ]; then
+                         echo "${l}"
+               fi
        done | sed -E -e 's/^lib//' -e 's/\..*$$//'  | sort -u > ${INUSRLIBSYSTEM}
        cd ${LIBSYS} && ls lib*.a | sed -E -e 's/_(debug|profile|static)\././' | while read l; do
            xcrun -sdk "${SDKROOT}" lipo "${LIBSYS}/${l}" -verify_arch "${arch}" 2>/dev/null
@@ -68,6 +72,7 @@ for arch in ${ARCHS}; do
 
        while read line ; do
            for lib in ${line} ; do
+               egrep -q "^${lib}$" ${INUSRLIBSYSTEM} && break
                egrep "^${lib}$" ${INUSRLOCALLIBSYSTEM} && break
            done
        done < ${ALLLIBS} > ${POSSIBLEUSRLOCALLIBSYSTEM}