diff --git a/utils/build-script-impl b/utils/build-script-impl index 9a45827895ae0..9af666b517210 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -3230,20 +3230,21 @@ for host in "${ALL_HOSTS[@]}"; do printJSONStartTimestamp dsymutil (cd "${host_symroot}" && find ./"${CURRENT_PREFIX}" -perm -0111 -type f -not -name "*.a" -not -name "*.py" -print | \ - xargs -n 1 -P ${DSYMUTIL_JOBS} ${dsymutil_path}) + xargs -t -n 1 -P ${DSYMUTIL_JOBS} ${dsymutil_path}) printJSONEndTimestamp dsymutil # Strip executables, shared libraries and static libraries in - # `host_install_destdir`. + # `host_install_destdir`. Avoid touching clang builtins .a files. find "${CURRENT_INSTALL_DIR}${CURRENT_PREFIX}/" \ '(' -perm -0111 -or -name "*.a" ')' -type f -print | \ - xargs -n 1 -P ${BUILD_JOBS} $(xcrun_find_tool strip) -S + grep_that_allows_no_matches -v "/clang/lib/darwin/" | \ + xargs -t -n 1 -P ${BUILD_JOBS} $(xcrun_find_tool strip) -S # Codesign dylibs and executables in usr/bin after strip tool # rdar://45388785 find "${CURRENT_INSTALL_DIR}${CURRENT_PREFIX}/" \ '(' '(' -path "*/usr/bin/*" -and -perm -0111 ')' -or -name "*.dylib" ')' -type f -print | \ - xargs -n 1 -P ${BUILD_JOBS} $(xcrun_find_tool codesign) -f -s - + xargs -t -n 1 -P ${BUILD_JOBS} $(xcrun_find_tool codesign) -f -s - fi { set +x; } 2>/dev/null diff --git a/validation-test/BuildSystem/dsymutil_jobs.test b/validation-test/BuildSystem/dsymutil_jobs.test index c0f4d70875ad9..810ff35d52a85 100644 --- a/validation-test/BuildSystem/dsymutil_jobs.test +++ b/validation-test/BuildSystem/dsymutil_jobs.test @@ -8,5 +8,5 @@ # CHECK: --- Extracting symbols --- # CHECK: { "command": "dsymutil", "start": " -# CHECK: xargs -n 1 -P 5 {{.*}}dsymutil +# CHECK: xargs -t -n 1 -P 5 {{.*}}dsymutil # CHECK: { "command": "dsymutil", "end": "