Skip to content

[embedded] Avoid strip-ing .a embedded libraries #73954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2024
Merged

[embedded] Avoid strip-ing .a embedded libraries #73954

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1113cff
[embedded] Avoid building embedded stdlib when cross-compiling
kubamracek May 28, 2024
56016a8
[embedded] Avoid strip-ing .a embedded libraries
kubamracek May 28, 2024
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
12 changes: 11 additions & 1 deletion utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,15 @@ function set_build_options_for_host() {
-DCMAKE_OSX_ARCHITECTURES="${architecture}"
)

# Avoid building the embedded stdlib and other embedded libraries when cross-compiling.
# Those are already provided by the local host build, and are identical and only cause
# trouble when lipo-ing if they are produced in cross-compile builds too.
if [[ $(is_cross_tools_host "${host}") ]] ; then
swift_cmake_options+=(
-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB:BOOL=FALSE
)
fi

lldb_cmake_options+=(
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="${cmake_osx_deployment_target}"
-DCMAKE_OSX_SYSROOT:PATH="${cmake_os_sysroot}"
Expand Down Expand Up @@ -3336,10 +3345,11 @@ for host in "${ALL_HOSTS[@]}"; do
printJSONEndTimestamp dsymutil

# Strip executables, shared libraries and static libraries in
# `host_install_destdir`. Avoid touching clang builtins .a files.
# `host_install_destdir`. Avoid touching .a clang builtins and embedded libraries.
find "${CURRENT_INSTALL_DIR}${CURRENT_PREFIX}/" \
'(' -perm -0111 -or -name "*.a" ')' -type f -print | \
grep_that_allows_no_matches -v "/clang/lib/darwin/" | \
grep_that_allows_no_matches -v "/lib/swift/embedded/" | \
xargs -t -n 1 -P ${BUILD_JOBS} $(xcrun_find_tool strip) -S

# Codesign dylibs and executables in usr/bin after strip tool
Expand Down