Skip to content

Fix destination for clang-builtin-headers-in-clang-resource-dir #34364

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 1 commit into from
Oct 23, 2020
Merged

Fix destination for clang-builtin-headers-in-clang-resource-dir #34364

merged 1 commit into from
Oct 23, 2020

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented Oct 20, 2020

LLVM_LIBRARY_OUTPUT_INTDIR already points to the lib subdirectory of
LLVM build folder.

Addresses rdar://70486284

@edymtt
Fix destination for clang-builtin-headers-in-clang-resource-dir
89abc04 
`LLVM_LIBRARY_OUTPUT_INTDIR` already points to the `lib` subdirectory of
LLVM build folder.

Addresses rdar://70486284
@edymtt
Copy link
Contributor Author

edymtt commented Oct 20, 2020

@swift-ci please smoke test

@edymtt
Copy link
Contributor Author

edymtt commented Oct 20, 2020

@swift-ci Please Build Toolchain

@edymtt
Copy link
Contributor Author

edymtt commented Oct 20, 2020

@swift-ci Please Test Source Compatibility Release

@swift-ci
Copy link
Contributor

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 89abc04

Install command
tar zxf swift-PR-34364-468-ubuntu16.04.tar.gz
More info

@swift-ci
Copy link
Contributor

macOS Toolchain
Download Toolchain
Git Sha - 89abc04

Install command
tar -zxf swift-PR-34364-732-osx.tar.gz --directory ~/

@edymtt
Copy link
Contributor Author

edymtt commented Oct 21, 2020

The Source Compatibility Suite failed building Evergreen -- this does not seem a regression from this PR, since I can find that in the main run as well (e.g. https://ci.swift.org/view/Source%20Compatibility/job/swift-main-source-compat-suite/5531/)

[The purpose of testing Source Compatibility Suite was more to ensure my change did not affect building the toolchain in there]

@edymtt
Copy link
Contributor Author

edymtt commented Oct 21, 2020

swiftlang/swift-source-compat-suite#466
@swift-ci Please Test Source Compatibility Release

compnerd
compnerd approved these changes Oct 22, 2020
View reviewed changes
Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Whoops! Nice find.

@edymtt
Copy link
Contributor Author

edymtt commented Oct 22, 2020

@swift-ci Please Test Source Compatibility Release

@edymtt edymtt merged commit 0fb4080 into swiftlang:main Oct 23, 2020
@edymtt edymtt deleted the fix-destination-clang-builtin-headers-in-clang-resource-dir branch October 23, 2020 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd compnerd approved these changes

@porglezomp porglezomp porglezomp approved these changes

@benlangmuir benlangmuir benlangmuir approved these changes

@shahmishal shahmishal Awaiting requested review from shahmishal

@artemcm artemcm Awaiting requested review from artemcm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@edymtt @swift-ci @compnerd @porglezomp @benlangmuir