Skip to content

Update CMakeLists.txt #3692

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

compnerd
Copy link
Member

Fix the unified build by using LLVM_CMAKE_PATH rather than LLVM_CMAKE_DIR. This matches the previous behaviour, and relies on the standalone build defining LLVM_CMAKE_PATH through LLVM_CMAKE_DIR.

Fix the unified build by using `LLVM_CMAKE_PATH` rather than `LLVM_CMAKE_DIR`.  This matches the previous behaviour, and relies on the standalone build defining `LLVM_CMAKE_PATH` through `LLVM_CMAKE_DIR`.
@compnerd
Copy link
Member Author

CC: @JDevlieghere @etcwilde

@compnerd
Copy link
Member Author

@swift-ci please test

@JDevlieghere
Copy link

So this fixes the unified build (and works for the standalone build), but breaks llvm.org. Also, other projects are all using LLVM_CMAKE_DIR.

llvm/include/llvm/Support/CMakeLists.txt
6:set(generate_vcs_version_script "${LLVM_CMAKE_DIR}/GenerateVersionFromVCS.cmake")

lld/Common/CMakeLists.txt
11:set(generate_vcs_version_script "${LLVM_CMAKE_DIR}/GenerateVersionFromVCS.cmake")

clang/lib/Basic/CMakeLists.txt
11:set(generate_vcs_version_script "${LLVM_CMAKE_DIR}/GenerateVersionFromVCS.cmake")

In the unified build, can we set LLVM_CMAKE_DIR based on LLVM_CMAKE_PATH?

@compnerd
Copy link
Member Author

compnerd commented Dec 14, 2021

We do the inverse in the standalone build: https://github.com/apple/llvm-project/blob/stable/20210726/lldb/cmake/modules/LLDBStandalone.cmake#L14

Where in the unified build were you thinking of changing that? The current unified build actually does not have a special path, it works the same as the upstream build. On the other hand, next does something weird: https://github.com/apple/llvm-project/blob/next/lldb/cmake/modules/LLDBStandalone.cmake#L14

Could this be a bad merge?

@compnerd compnerd merged commit e2549b7 into stable/20210726 Dec 15, 2021
@compnerd compnerd deleted the compnerd/paths-are-dirs-but-dirs-are-not-paths branch December 15, 2021 02:11
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.

2 participants