Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions utils/build-script-impl
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ KNOWN_SETTINGS=(
darwin-deployment-version-watchos "6.0" "minimum deployment target version for watchOS"
darwin-deployment-version-xros "1.0" "minimum deployment target version for xrOS"
darwin-install-extract-symbols "" "whether to extract symbols with dsymutil during installations"
darwin-install-extract-symbols-use-just-built-dsymutil "1" "whether we should extract symbols using the just built dsymutil"
darwin-install-extract-symbols-use-just-built-dsymutil "" "whether we should extract symbols using the just built dsymutil"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This alone will not guarantee that the dsymutil provided by the underlying toolchain/SDK is not built with asserts.

I think a better option is to to add --verify-dwarf none on the invocation on line 3096, and have users override this with --extra-dsymutil-args when needed (assuming dsymutil takes the last option, which I haven't verified)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can add it, but I still don't think using the just-built dsymutil should be the default.

darwin-symroot-path-filters "" "space-separated list of path patterns to consider for symbol generation"
darwin-overlay-target "" "single overlay target to build, dependencies are computed later"
darwin-sdk-deployment-targets "xctest-ios-8.0" "semicolon-separated list of triples like 'fookit-ios-9.0;barkit-watchos-9.0'"
Expand Down Expand Up @@ -3093,7 +3093,7 @@ 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 -t -n 1 -P ${DSYMUTIL_JOBS} ${dsymutil_path} ${EXTRA_DSYMUTIL_ARGS[@]})
xargs -t -n 1 -P ${DSYMUTIL_JOBS} ${dsymutil_path} --verify-dwarf none ${EXTRA_DSYMUTIL_ARGS[@]})
printJSONEndTimestamp dsymutil

# Strip executables, shared libraries and static libraries in
Expand Down