Skip to content

[build] Refer to projects through the monorepo directly #28296

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.

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

Conversation

bulbazord
Copy link
Contributor

Why am I doing this?
Because we have now switched to the monorepo, we no longer need to have logic to
detect whether or not a project is present. Any project under the llvm project
is guaranteed to be available if you're building llvm.

I hope this is the first change of many that can clean up some of the logic in
build-script-impl. Some simplifications and cleanups that I think can be made
include:

  • Adding the option to build swift as a part of the llvm build. (Or even making
    this the default behavior)
  • Taking advantage of LLVM_ENABLE_PROJECTS to simplify some of the logic to
    set up clang, clang-tools-extra, and other projects.

cc @compnerd @Rostepher @gottesmm @shahmishal @brentdax

Why am I doing this?
Because we have now switched to the monorepo, we no longer need to have logic to
detect whether or not a project is present. Any project under the llvm project
is guaranteed to be available if you're building llvm.

I hope this is the first change of many that can clean up some of the logic in
build-script-impl. Some simplifications and cleanups that I think can be made
include:
- Adding the option to build swift as a part of the llvm build. (Or even making
  this the default behavior)
- Taking advantage of `LLVM_ENABLE_PROJECTS` to simplify some of the logic to
  set up clang, clang-tools-extra, and other projects.
@bulbazord
Copy link
Contributor Author

@swift-ci please test

@shahmishal
Copy link
Member

@swift-ci build toolchain

@swift-ci
Copy link
Contributor

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

Install command
tar zxf swift-PR-28296-317-ubuntu16.04.tar.gz
More info

@swift-ci
Copy link
Contributor

macOS Toolchain
Download Toolchain
Git Sha - 2978884

Install command
tar -zxf swift-PR-28296-433-osx.tar.gz --directory ~/

@shahmishal shahmishal merged commit a596172 into swiftlang:master Nov 16, 2019
@shahmishal
Copy link
Member

Thanks @xiaobai!

@shahmishal
Copy link
Member

We should also cherry-pick this to swift-5.1-branch.
@xiaobai Can you cherry-pick it?

@shahmishal
Copy link
Member

We are seeing build failure if we remove the symlink

/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/swift/utils/build-script: fatal error: can't find source directory for llvm (tried /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/llvm)

#28305

@bulbazord
Copy link
Contributor Author

@shahmishal I can cherry-pick it to the swift-5.1-branch sure. I also can take a look at why removing the symlinks fails. :)

@bulbazord bulbazord deleted the mono-for-all-and-all-for-mono branch November 18, 2019 18:07
@shahmishal
Copy link
Member

@xiaobai To resolve the symlink issue we needed to update the build system scripts - #28305.
Sorry, let me double check if we need to take this change into 5.1 branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants