Skip to content

Disable unnecessary rebuilds on git changes #813

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

Merged
vgvassilev merged 2 commits into from
Jul 26, 2017
Merged

Disable unnecessary rebuilds on git changes #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db2e772
Disable rebuilding unnecessarily when git HEAD changes.
Teemperor Jul 26, 2017
3bd83ce
Fix that LLVM currently rebuilds unnecessarily when git HEAD changes.
Teemperor Jul 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions interpreter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ set(CLANG_ENABLE_FORMAT OFF CACHE BOOL "")
#---Remove the inherited include_directories()
set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "")

#---Disable VCS writing to prevent that we always have to rebuild when someone touched the git HEAD
set(LLVM_APPEND_VC_REV OFF CACHE BOOL "Disabled LLVM revision dependency" FORCE)

#---Add the sub-directory excluding all the targets from all-----------------------------------------
if(CMAKE_GENERATOR MATCHES "Xcode")
add_subdirectory(llvm/src)
Expand Down
7 changes: 7 additions & 0 deletions interpreter/llvm/src/include/llvm/Support/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ set(version_inc "${CMAKE_CURRENT_BINARY_DIR}/VCSRevision.h")

set(get_svn_script "${LLVM_CMAKE_PATH}/GenerateVersionFromCVS.cmake")

# Ugly hack to prevent rebuilding LLVM whenever the git HEAD timestamp
# changes. This is properly solved by setting LLVM_APPEND_VC_REV to OFF
# but this only really works once this review is included in our LLVM
# version: https://reviews.llvm.org/D35377
Copy link
Member

@vgvassilev vgvassilev Jul 26, 2017

Choose a reason for hiding this comment

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

Can't we backport it?

Copy link
Contributor Author

@Teemperor Teemperor Jul 26, 2017

Choose a reason for hiding this comment

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

It's multiple commits that refactored this thing, D35377 is only the one that actually makes it fully work as intended (we don't even have the setting variable he's using in our CMake code yet), and backporting bigger pieces of CMake code isn't a lot of fun.

It's also just until the next LLVM upgrade where the other commit fixes this properly and we can drop this hack.

Copy link
Member

@vgvassilev vgvassilev Jul 26, 2017

Choose a reason for hiding this comment

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

Sounds reasonable to me, thanks for explaining.

# Once our LLVM version includes this review, this code can be removed
# as we properly set LLVM_APPEND_VC_REV in interpreter/CMakeLists.txt.
set(llvm_vc)
if(DEFINED llvm_vc)
# Create custom target to generate the VC revision include.
add_custom_command(OUTPUT "${version_inc}"
Expand Down