Skip to content

[swift-stdlib-tool] use correct paths when codesigning #40093

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
Nov 9, 2021
Merged

[swift-stdlib-tool] use correct paths when codesigning #40093

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fcccfd
[swift-stdlib-tool] fix inverted logic
rmaz Nov 8, 2021
e9fe603
[swift-stdlib-tool] use correct path when codesigning
rmaz Nov 8, 2021
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
8 changes: 4 additions & 4 deletions tools/swift-stdlib-tool/swift-stdlib-tool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,13 +1226,13 @@ int main(int argc, const char *argv[]) {
// and $build_dir/$unsigned_frameworks
if (copy) {
copyLibraries(dst_dir, swiftLibs, stripBitcode);
if (unsigned_dst_dir.empty()) {
if (!unsigned_dst_dir.empty()) {
// Never strip bitcode from the unsigned libraries.
// Their existing signatures must be preserved.
copyLibraries(unsigned_dst_dir, swiftLibs, false);
}

if (resource_dst_dir.empty()) {
if (!resource_dst_dir.empty()) {
// Never strip bitcode from resources libraries, for
// the same reason as the libraries copied to
// unsigned_dst_dir.
Expand All @@ -1242,7 +1242,7 @@ int main(int argc, const char *argv[]) {

// Codesign the Swift libraries in $build_dir/$frameworks
// but not the libraries in $build_dir/$unsigned_frameworks.
if (ident.empty()) {
if (!ident.empty()) {
// Swift libraries that are up-to-date get codesigned anyway
// (in case options changed or a previous build was incomplete).
// We do employ an optimization, however, if resigning the dylib
Expand All @@ -1269,7 +1269,7 @@ int main(int argc, const char *argv[]) {
// to preserve it in case it does not change. We can use
// this to avoid unnecessary copies during delta installs
// to devices.
const auto dst = dst_dir + "/" + lib;
const auto dst = dst_dir + "/" + filename(lib);
const auto oldSignatureData = query_code_signature(dst);
const char *tmpFilePath = 0;
if (!oldSignatureData.empty()) {
Expand Down