This is an archive of the discontinued LLVM Phabricator instance.

cmake: Set rpath for loadable modules as well as shared libraries.
ClosedPublic

Authored by pcc on Nov 28 2016, 2:05 PM.

Reviewers

Commits

Summary

This fixes a regression introduced by r285714.
Spotted by mark@chromium.org!

Build Status

Buildable 1647
Build 1647: arc lint + arc unit

pcc retitled this revision from to cmake: Set rpath for loadable modules as well as shared libraries..

pcc updated this object.

pcc added a reviewer: beanz.

pcc added subscribers: thakis, llvm-commits.

lgtm

This revision is now accepted and ready to land.Nov 28 2016, 2:07 PM

Thanks!

Might want to mention that this affects LLVMgold.so in the patch description.

This revision was automatically updated to reflect the committed changes.

Path

Size

llvm/

cmake/

modules/

1 line

Show First 20 Lines • Show All 406 Lines • ▼ Show 20 Lines	llvm_add_library(${name_static} STATIC
LINK_COMPONENTS ${ARG_LINK_COMPONENTS}		LINK_COMPONENTS ${ARG_LINK_COMPONENTS}
)		)
# FIXME: Add name_static to anywhere in TARGET ${name}'s PROPERTY.		# FIXME: Add name_static to anywhere in TARGET ${name}'s PROPERTY.
set(ARG_STATIC)		set(ARG_STATIC)
endif()		endif()

if(ARG_MODULE)		if(ARG_MODULE)
add_library(${name} MODULE ${ALL_FILES})		add_library(${name} MODULE ${ALL_FILES})
		llvm_setup_rpath(${name})
elseif(ARG_SHARED)		elseif(ARG_SHARED)
add_windows_version_resource_file(ALL_FILES ${ALL_FILES})		add_windows_version_resource_file(ALL_FILES ${ALL_FILES})
add_library(${name} SHARED ${ALL_FILES})		add_library(${name} SHARED ${ALL_FILES})

llvm_setup_rpath(${name})		llvm_setup_rpath(${name})

else()		else()
add_library(${name} STATIC ${ALL_FILES})		add_library(${name} STATIC ${ALL_FILES})
▲ Show 20 Lines • Show All 979 Lines • Show Last 20 Lines