Skip to content

[5.1][SDK] Adjust dependency script & regenerate dependencies #25836

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

Jump to bottom
Merged
merged 3 commits into from
Jun 29, 2019
Merged

[5.1][SDK] Adjust dependency script & regenerate dependencies #25836

merged 3 commits into from
Jun 29, 2019

Conversation

lorentey
Copy link
Member

Cherry-picked from #25425.

The overlay dependencies are a bit out date with the SDKs that are in Xcode 11 beta 1, and this causes CI issues. Adjust the script to reduce the amount of noise it generates and regenerate overlay dependencies.

rdar://problem/51634433

lorentey added 3 commits June 27, 2019 15:30
@lorentey
[utils] find-overlay-dependencies: reduce noise
76e8155 
- Don’t special-case Foundation.
- Don’t update files if the only change is in the ordering.
- Match for a space after CMAKE_DEPENDS_NAME.

(cherry picked from commit 7792d4c)
@lorentey
[Foundation] Manually add CoreGraphics dependency
a6ac11d 
This isn’t hardcoded into the dependency detection script anymore.

(cherry picked from commit 22e0b4a)
@lorentey
[SDK] Regenerate overlay dependencies
a394cca 
(cherry picked from commit 09c8997)
@lorentey
Copy link
Member Author

@swift-ci clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - a394cca

@lorentey
Copy link
Member Author 

16:10:15 FAILED: lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.x86_64.dir/sanitizer_linux_x86_64.S.o 
16:10:15 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.1-branch/buildbot_linux/llvm-linux-x86_64/./bin/clang  -DHAVE_RPC_XDR_H=0 -DHAVE_TIRPC_RPC_XDR_H=0 -I/home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.1-branch/llvm/projects/compiler-rt/lib/sanitizer_common/.. -O3 -DNDEBUG    -m64 -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -fno-rtti -Wframe-larger-than=570 -Wglobal-constructors -MMD -MT lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.x86_64.dir/sanitizer_linux_x86_64.S.o -MF lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.x86_64.dir/sanitizer_linux_x86_64.S.o.d -o lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.x86_64.dir/sanitizer_linux_x86_64.S.o -c /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.1-branch/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux_x86_64.S
16:10:15 
clang-7: error: unable to make temporary file: No such file or directory

@lorentey
Copy link
Member Author

This has NFC on linux.

@swift-ci test linux platform

@lorentey lorentey changed the title [SDK] Adjust dependency script & regenerate dependencies [5.1][SDK] Adjust dependency script & regenerate dependencies Jun 28, 2019
@lorentey
Copy link
Member Author

@swift-ci test linux platform

@lorentey lorentey merged commit dcde8ac into swiftlang:swift-5.1-branch Jun 29, 2019
@lorentey lorentey deleted the regenerate-deps-5.1 branch June 29, 2019 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lorentey @swift-ci