This is an archive of the discontinued LLVM Phabricator instance.

Paths

Table of Contentst

-
llvm/include/llvm/
-
include/
-
llvm/
-
CMakeLists.txt

Differential D115553

Partial revert, hopefully fix LLVM module maps build
AbandonedPublic

Authored by Ericson2314 on Dec 10 2021, 1:56 PM.

Download Raw Diff

Details

Reviewers

mib

Summary

In 492de35df443d5f31480173d5f1274c7835cd3d8 / D115544 I accidentally
added ${LLVM_INCLUDE_DIR}/ to the destination path. This broke the
"LLDB Incremental" build. Putting it back the way it was should fix it.

Diff Detail

Repository: rG LLVM Github Monorepo

Unit TestsFailed

	Time	Test
	830 ms	x64 debian > AddressSanitizer-x86_64-linux.TestCases::non-executable-pc.cpp

Event Timeline

Ericson2314 created this revision.Dec 10 2021, 1:56 PM

Herald added a subscriber: mgorny. · View Herald TranscriptDec 10 2021, 1:56 PM

Ericson2314 requested review of this revision.Dec 10 2021, 1:56 PM

Herald added a project: Restricted Project. · View Herald TranscriptDec 10 2021, 1:56 PM

Herald added a subscriber: llvm-commits. · View Herald Transcript

Improve wording

Ericson2314 retitled this revision from Fix LLVM module maps to Partial revert, hopefully fix LLVM module maps build.Dec 10 2021, 1:59 PM

Ericson2314 mentioned this in D115544: Revert "Revert "Use `GNUInstallDirs` to support custom installation dirs. -- LLVM"".

Ericson2314 added a reviewer: mib.

mib accepted this revision.Dec 10 2021, 2:19 PM

This revision is now accepted and ready to land.Dec 10 2021, 2:19 PM

Harbormaster completed remote builds in B138733: Diff 393590.Dec 10 2021, 2:40 PM

mib mentioned this in rG8d897ec91528: [llvm] Partial revert, hopefully fix LLVM module maps build.Dec 10 2021, 5:18 PM

mib mentioned this in rG654aa3ad92f2: Revert "[llvm] Partial revert, hopefully fix LLVM module maps build".Dec 10 2021, 5:34 PM

I tentatively landed this to fix the macOS bots but it kept failing as shown here:

https://green.lab.llvm.org/green/job/lldb-cmake/39267/

Unfortunately, I had to revert this as well as D115544 to fix macOS bots.

This revision now requires changes to proceed.Dec 10 2021, 5:40 PM

@mib thanks for cleaning up my mess :/. Hopefully I will find a way to properly reproduce this stuff sound.

In D115553#3186845, @Ericson2314 wrote:

@mib thanks for cleaning up my mess :/. Hopefully I will find a way to properly reproduce this stuff sound.

Np ;) I think you should be able to grab the macOS bots cmake invocation by looking at the logs and hopefully reproduce the issue locally. :)

@mib Yeah the the build failures now seem less tricky than the configure-time one from before.

I think also starting from LLVM and working my way "outward" was a mistake, due to the complexities of the non-standalone builds. I think I might start from the outside and work my way "inward" to LLVM instead.

To start, I opened up https://reviews.llvm.org/D115566 which just does some of the quoting everything, to sanity check that and get it out of the way.

This unfortunately proved not to be sufficient.

Revision Contents

Path

Size

llvm/

include/

llvm/

CMakeLists.txt

2 lines

Diff 393590

llvm/include/llvm/CMakeLists.txt

	add_subdirectory(IR)			add_subdirectory(IR)
	add_subdirectory(Support)			add_subdirectory(Support)
	add_subdirectory(Frontend)			add_subdirectory(Frontend)

	# If we're doing an out-of-tree build, copy a module map for generated			# If we're doing an out-of-tree build, copy a module map for generated
	# header files into the build area.			# header files into the build area.
	if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")			if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
	configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY)			configure_file(module.modulemap.build module.modulemap COPYONLY)
	endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")			endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")