[build] properly install compiler-rt from Xcode toolchain #31247

edymtt · 2020-04-23T20:46:07Z

Similarly to what was done for #25547, copy the compiler-rt built-ins
for embedded platforms from the Xcode toolchain into the new generated
one, so to avoid link time errors.

Addresses SR-12001, rdar://57837918

Similarly to what was done for swiftlang#25547, copy the compiler-rt built-ins for embedded platforms from the Xcode toolchain into the new generated one, so to avoid link time errors. Addresses SR-12001, rdar://57837918

edymtt · 2020-04-23T20:46:24Z

@swift-ci please smoke test

edymtt · 2020-04-23T20:46:50Z

@swift-ci Please Build Toolchain macOS Platform

swift-ci · 2020-04-23T22:30:14Z

macOS Toolchain
Download Toolchain
Git Sha - 3894e37

Install command
tar -zxf swift-PR-31247-499-osx.tar.gz --directory ~/

utils/build-script-impl

mikeash

Couple of small comments, and +1 on @compnerd's comments. LGTM otherwise.

utils/build-script-impl

edymtt · 2020-04-24T16:27:26Z

@swift-ci please smoke test

edymtt · 2020-04-24T16:27:35Z

@swift-ci Please Build Toolchain macOS Platform

edymtt · 2020-04-24T16:27:44Z

@swift-ci Please Build Toolchain Linux Platform

edymtt · 2020-04-24T16:36:43Z

@swift-ci please test Windows

shahmishal · 2020-04-24T16:58:49Z

Another way to fix this issue would be to remove the compiler-rt lib from Swift Toolchain, and let Xcode automatically pick up the lib from XcodeDefault toolchain.

shahmishal · 2020-06-15T19:16:30Z

@edymtt What is the status of this PR? Which option are we going forward with copying the compiler-rt in the swift.org toolchain or using the compiler-rt from XcodeDefault toolchain?

shahmishal · 2020-10-01T06:55:17Z

Please update the base branch to main by Oct 5th otherwise the pull request will be closed automatically.

How to change the base branch: (Link)
More detail about the branch update: (Link)

…iler_rt

edymtt · 2020-10-02T16:34:09Z

@shahmishal apologies for the overdue reply -- as per previous offline discussions, we are going forward with copying the compiler-rt in the swift.org toolchain

edymtt · 2020-10-02T16:50:19Z

For the sake of completeness, the merge revolves around integrating correctly #33133

edymtt · 2020-10-06T18:02:49Z

@swift-ci please smoke test

edymtt · 2020-10-06T18:03:00Z

@swift-ci please build Swift toolchain

edymtt · 2020-10-06T18:03:57Z

@swift-ci Please Build Toolchain

shahmishal · 2020-10-06T19:04:21Z

If we copy the file from Xcode toolchain over to the open source toolchain would it cause any problem if the end user is using different Xcode than CI node?

For example:
Swift CI node has Xcode 12, and they try using the toolchain on Xcode 11.

swift-ci · 2020-10-06T19:23:08Z

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 024487b

Install command
tar zxf swift-PR-31247-454-ubuntu16.04.tar.gz
More info

mikeash · 2020-10-06T19:35:54Z

There shouldn't be any trouble with a version mismatch. We need a compatible library but not necessarily one that precisely matches the Xcode you're using.

edymtt · 2020-10-07T14:25:06Z

@swift-ci please smoke test macOS

edymtt · 2020-10-07T14:25:37Z

@swift-ci please smoke test Linux

edymtt · 2020-10-07T16:21:17Z

@swift-ci Please Build Toolchain

swift-ci · 2020-10-07T17:41:00Z

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - b07c940

Install command
tar zxf swift-PR-31247-457-ubuntu16.04.tar.gz
More info

swift-ci · 2020-10-07T20:15:50Z

macOS Toolchain
Download Toolchain
Git Sha - b07c940

Install command
tar -zxf swift-PR-31247-717-osx.tar.gz --directory ~/

edymtt · 2020-10-07T21:24:51Z

Tested the program attached to SR-12001 with the macOS toolchain, now it builds fine

Also inspected the generated toolchain to ensure the files are correctly copied at usr/lib/clang/10.0.0/lib/darwin

shahmishal · 2020-10-07T21:44:56Z

We should cherry-pick this over the release/5.3 branch because it's broken on 5.3.

edymtt · 2020-10-07T22:15:02Z

@swift-ci please smoke test

edymtt · 2020-10-07T22:15:11Z

@swift-ci Please Build Toolchain

swift-ci · 2020-10-07T23:35:53Z

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 813f5d2

Install command
tar zxf swift-PR-31247-458-ubuntu16.04.tar.gz
More info

edymtt · 2020-10-08T14:30:17Z

@swift-ci please smoke test

edymtt · 2020-10-08T14:30:25Z

@swift-ci please smoke test macOS

edymtt · 2020-10-08T14:30:56Z

@swift-ci please smoke test macOS

edymtt · 2020-10-08T14:31:06Z

@swift-ci Please Build Toolchain macOS

Similarly to what was done for swiftlang#25547, copy the compiler-rt built-ins for embedded platforms from the Xcode toolchain into the new generated one, so to avoid link time errors. Addresses SR-12001, rdar://57837918 Cherry-pick of swiftlang#31247 -- this also brings in the improvements from swiftlang#34049

edymtt · 2020-10-08T15:32:40Z

@swift-ci please smoke test macOS

edymtt · 2020-10-08T17:36:24Z

@swift-ci Please clean Build Toolchain macOS

edymtt · 2020-10-08T17:37:07Z

@swift-ci Please Build Toolchain macOS

shahmishal · 2020-10-08T20:10:27Z

02:30:22.266 -- Copying file /Users/buildnode/jenkins/workspace/swift-PR-toolchain-osx/branch-main/swift-nightly-install/Library/Developer/Toolchains/swift-PR-31247-720.xctoolchain/usr/lib/swift/watchsimulator/libswiftCompatibilityDynfatal error: /Applications/Xcode-beta.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/lipo: /Users/buildnode/jenkins/workspace/swift-PR-toolchain-osx/branch-main/buildbot_osx/intermediate-install/macosx-x86_64/Library/Developer/Toolchains/swift-PR-31247-720.xctoolchain/usr/lib/swift/macosx/libswiftObjectiveC.dylib and /Users/buildnode/jenkins/workspace/swift-PR-toolchain-osx/branch-main/buildbot_osx/intermediate-install/macosx-arm64/Library/Developer/Toolchains/swift-PR-31247-720.xctoolchain/usr/lib/swift/macosx/libswiftObjectiveC.dylib have the same architectures (x86_64) and can't be in the same fat output file

edymtt · 2020-10-08T20:29:34Z

This error does not seem related to this PR (since it happens when installing Swift) and from the log there is no concrete evidence on why those files end up with the same architecture.

edymtt · 2020-10-08T22:49:02Z

#34236 did not have this failure, so this seems to rule out my change -- trying again

edymtt · 2020-10-08T22:49:10Z

@swift-ci Please Build Toolchain macOS

swift-ci · 2020-10-09T02:57:20Z

macOS Toolchain
Download Toolchain
Git Sha - 813f5d2

Install command
tar -zxf swift-PR-31247-725-osx.tar.gz --directory ~/

edymtt · 2020-10-09T20:30:40Z

Verified that the new toolchain (725) is able to compile the program attached to SR-12001 and that it contains the compiler-rt libraries as usr/lib/clang/10.0.0/lib/darwin

Similarly to what was done for #25547, copy the compiler-rt built-ins for embedded platforms from the Xcode toolchain into the new generated one, so to avoid link time errors. Addresses SR-12001, rdar://57837918 Cherry-pick of #31247 -- this also brings in the improvements from #34049

[build] properly install compiler-rt from Xcode toolchain

3894e37

Similarly to what was done for swiftlang#25547, copy the compiler-rt built-ins for embedded platforms from the Xcode toolchain into the new generated one, so to avoid link time errors. Addresses SR-12001, rdar://57837918

edymtt requested review from compnerd, mikeash and shahmishal April 23, 2020 20:46

compnerd reviewed Apr 23, 2020

View reviewed changes

utils/build-script-impl Outdated Show resolved Hide resolved

utils/build-script-impl Outdated Show resolved Hide resolved

utils/build-script-impl Outdated Show resolved Hide resolved

mikeash approved these changes Apr 24, 2020

View reviewed changes

utils/build-script-impl Outdated Show resolved Hide resolved

utils/build-script-impl Outdated Show resolved Hide resolved

edymtt added 2 commits April 24, 2020 09:10

Make comment more precise as per review feedback

359d54b

Tackle remaining review feedback

0ca06c2

edymtt changed the base branch from master to main October 2, 2020 15:59

Merge remote-tracking branch 'origin/main' into install_embedded_comp…

024487b

…iler_rt

edymtt requested a review from hyp October 2, 2020 16:34

Don't exit with error if we don't have libraries to copy

b07c940

shahmishal approved these changes Oct 7, 2020

View reviewed changes

Restore logic dropped during the merge resolution

813f5d2

edymtt mentioned this pull request Oct 8, 2020

[5.3][build] properly install compiler-rt from Xcode toolchain #34236

Merged

edymtt merged commit 0f6611c into swiftlang:main Oct 12, 2020

edymtt mentioned this pull request Oct 12, 2020

[SR-12001] Swift 5.2 toolchain ObjC Availability API crash #54436

Open

[build] properly install compiler-rt from Xcode toolchain #31247

[build] properly install compiler-rt from Xcode toolchain #31247

Uh oh!

Conversation

edymtt commented Apr 23, 2020

Uh oh!

edymtt commented Apr 23, 2020

Uh oh!

edymtt commented Apr 23, 2020

Uh oh!

swift-ci commented Apr 23, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mikeash left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

edymtt commented Apr 24, 2020

Uh oh!

edymtt commented Apr 24, 2020

Uh oh!

edymtt commented Apr 24, 2020

Uh oh!

edymtt commented Apr 24, 2020

Uh oh!

shahmishal commented Apr 24, 2020

Uh oh!

shahmishal commented Jun 15, 2020

Uh oh!

shahmishal commented Oct 1, 2020

Uh oh!

edymtt commented Oct 2, 2020

Uh oh!

edymtt commented Oct 2, 2020

Uh oh!

edymtt commented Oct 6, 2020

Uh oh!

edymtt commented Oct 6, 2020

Uh oh!

edymtt commented Oct 6, 2020

Uh oh!

shahmishal commented Oct 6, 2020

Uh oh!

swift-ci commented Oct 6, 2020

Uh oh!

mikeash commented Oct 6, 2020

Uh oh!

edymtt commented Oct 7, 2020

Uh oh!

edymtt commented Oct 7, 2020

Uh oh!

edymtt commented Oct 7, 2020

Uh oh!

swift-ci commented Oct 7, 2020

Uh oh!

swift-ci commented Oct 7, 2020

Uh oh!

edymtt commented Oct 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shahmishal commented Oct 7, 2020

Uh oh!

edymtt commented Oct 7, 2020

Uh oh!

edymtt commented Oct 7, 2020

Uh oh!

swift-ci commented Oct 7, 2020

Uh oh!

edymtt commented Oct 8, 2020

Uh oh!

edymtt commented Oct 8, 2020

Uh oh!

edymtt commented Oct 8, 2020

Uh oh!

edymtt commented Oct 8, 2020

Uh oh!

edymtt commented Oct 8, 2020

edymtt commented Oct 7, 2020 •

edited

Loading

edymtt commented Oct 9, 2020 •

edited

Loading