This is an archive of the discontinued LLVM Phabricator instance.

Paths

Table of Contentst

-
llvm/cmake/modules/
-
cmake/
-
modules/
-
LLVMConfig.cmake.in

Differential D142403

[build] Fix stand-alone builds of clang.
ClosedPublic

Authored by fpetrogalli on Jan 23 2023, 1:47 PM.

Download Raw Diff

Details

Reviewers

mgorny
tstellar
jdoerfert

Commits

rGaa19429b19b6: Re-apply [build] Fix stand-alone builds of clang.
rG5d02e38f56df: [build] Fix stand-alone builds of clang.

Summary

The target RISCVTargetParserTablegen needs to be visible for stand-alone [1] builds of clang to prevent configuration failures.

[1] https://llvm.org/docs/GettingStarted.html#stand-alone-builds

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

fpetrogalli created this revision.Jan 23 2023, 1:47 PM

Herald added a project: Restricted Project. · View Herald TranscriptJan 23 2023, 1:47 PM

Herald added subscribers: luismarques, s.egerton, kadircet and 3 others. · View Herald Transcript

fpetrogalli requested review of this revision.Jan 23 2023, 1:47 PM

Herald added a project: Restricted Project. · View Herald TranscriptJan 23 2023, 1:47 PM

Herald added subscribers: cfe-commits, • pcwang-thead, MaskRay, ilya-biryukov. · View Herald Transcript

fpetrogalli mentioned this in D142400: [cmake] Remove RISCVTargetParserTableGen from LLVMConfig.cmake.in.Jan 23 2023, 1:48 PM

This is still the wrong change IMO. I don't know, maybe I'm not being clear, but I don't 'think you ever actually tried my suggestion in D141581 which was to leave the RISCVTargetParserTableGen Depends as is and add the pseudo targets in llvm/cmake/modules/LLVMConfig.cmake.in.

In D142403#4074885, @tstellar wrote:

This is still the wrong change IMO. I don't know, maybe I'm not being clear, but I don't 'think you ever actually tried my suggestion in D141581 which was to leave the RISCVTargetParserTableGen Depends as is and add the pseudo targets in llvm/cmake/modules/LLVMConfig.cmake.in.

We'll get there! I think I missed the "leave the RISCVTargetParserTableGen in the DEPENDS, sorry about that.

In D142403#4074905, @fpetrogalli wrote:

In D142403#4074885, @tstellar wrote:

This is still the wrong change IMO. I don't know, maybe I'm not being clear, but I don't 'think you ever actually tried my suggestion in D141581 which was to leave the RISCVTargetParserTableGen Depends as is and add the pseudo targets in llvm/cmake/modules/LLVMConfig.cmake.in.

We'll get there! I think I missed the "leave the RISCVTargetParserTableGen in the DEPENDS, sorry about that.

No problem! Thanks for sticking with it.

barannikov88 added a subscriber: barannikov88.Jan 23 2023, 1:55 PM

Address code review.

Herald added a reviewer: jdoerfert. · View Herald TranscriptJan 23 2023, 2:01 PM

Herald added a project: Restricted Project. · View Herald Transcript

Herald added subscribers: llvm-commits, sstefan1. · View Herald Transcript

fpetrogalli retitled this revision from [build] Force building LLVMTargetParser before other non-LLVM components. to [build] Fix stand-alone builds of clang..Jan 23 2023, 2:02 PM

fpetrogalli edited the summary of this revision. (Show Details)

Harbormaster completed remote builds in B209471: Diff 491506.Jan 23 2023, 3:23 PM

LGTM. I tested and this fixes the build.

This revision is now accepted and ready to land.Jan 23 2023, 3:55 PM

This revision was landed with ongoing or failed builds.Jan 23 2023, 3:57 PM

Closed by commit rG5d02e38f56df: [build] Fix stand-alone builds of clang. (authored by fpetrogalli). · Explain Why

This revision was automatically updated to reflect the committed changes.

fpetrogalli added a commit: rG5d02e38f56df: [build] Fix stand-alone builds of clang..

In D142403#4075215, @tstellar wrote:

LGTM. I tested and this fixes the build.

Thank you @tstellar, I landed it. I am going offline for until tomorrow morning - feel free to revert it if the world of bots collapses :)

@mgorny - is this fixing also your builds?

fpetrogalli added a reverting change: rG0e09bb8b143c: Revert "[build] Fix stand-alone builds of clang.".Jan 23 2023, 4:25 PM

fpetrogalli added a commit: rGaa19429b19b6: Re-apply [build] Fix stand-alone builds of clang..Jan 23 2023, 4:30 PM

In D142403#4075215, @tstellar wrote:

LGTM. I tested and this fixes the build.

@tstellar , I wonder how your build (and mine too, in fact) didn't complain about the typo... luckily the bots cover this functionality! Anyway, I have re-landed it as https://reviews.llvm.org/rGaa19429b19b6a8d44a671a93bf9c00570bad53ac.

Revision Contents

Path

Size

llvm/

cmake/

modules/

LLVMConfig.cmake.in

9 lines

Diff 491531

llvm/cmake/modules/LLVMConfig.cmake.in

	Show First 20 Lines • Show All 134 Lines • ▼ Show 20 Lines

	set(LLVM_HAVE_LIBXAR "@LLVM_HAVE_LIBXAR@")			set(LLVM_HAVE_LIBXAR "@LLVM_HAVE_LIBXAR@")

	if(NOT TARGET LLVMSupport)			if(NOT TARGET LLVMSupport)
	@LLVM_CONFIG_INCLUDE_EXPORTS@			@LLVM_CONFIG_INCLUDE_EXPORTS@
	@llvm_config_include_buildtree_only_exports@			@llvm_config_include_buildtree_only_exports@
	endif()			endif()

	# By creating intrinsics_gen, omp_gen and acc_gen here, subprojects that depend			# By creating the following targets here, subprojects that depend on
	# on LLVM's tablegen-generated headers can always depend on this target whether			# LLVM's tablegen-generated headers can always depend on this target
	# building in-tree with LLVM or not.			# whether building in-tree with LLVM or not.
	if(NOT TARGET intrinsics_gen)			if(NOT TARGET intrinsics_gen)
	add_custom_target(intrinsics_gen)			add_custom_target(intrinsics_gen)
	endif()			endif()
	if(NOT TARGET omp_gen)			if(NOT TARGET omp_gen)
	add_custom_target(omp_gen)			add_custom_target(omp_gen)
	endif()			endif()
	if(NOT TARGET acc_gen)			if(NOT TARGET acc_gen)
	add_custom_target(acc_gen)			add_custom_target(acc_gen)
	endif()			endif()
				if(NOT TARGET RISCVTargetParserTablegen)
				add_custom_target(RISCVTargetParserTableGen)
				endif()

	set_property(GLOBAL PROPERTY LLVM_TARGETS_CONFIGURED On)			set_property(GLOBAL PROPERTY LLVM_TARGETS_CONFIGURED On)
	include(${LLVM_CMAKE_DIR}/LLVM-Config.cmake)			include(${LLVM_CMAKE_DIR}/LLVM-Config.cmake)