This is an archive of the discontinued LLVM Phabricator instance.

Differential D42462

[cmake] [compiler-rt] Call llvm_setup_rpath() when adding shared libraries.
ClosedPublic

Authored by hintonda on Jan 23 2018, 9:30 PM.

Download Raw Diff

Details

Reviewers

beanz
compnerd
phosek
EricWF

Commits

rG78fd93e0396a: [cmake] [compiler-rt] Call llvm_setup_rpath() when adding shared libraries.
rCRT323606: [cmake] [compiler-rt] Call llvm_setup_rpath() when adding shared libraries.
rL323606: [cmake] [compiler-rt] Call llvm_setup_rpath() when adding shared libraries.

Summary

Clang and llvm already use llvm_setup_rpath(), so this change will
help standarize rpath usage across all projects.

Diff Detail

Repository: rL LLVM

Event Timeline

hintonda created this revision.Jan 23 2018, 9:30 PM

Herald added subscribers: Restricted Project, llvm-commits, mgorny, dberris. · View Herald TranscriptJan 23 2018, 9:30 PM

Harbormaster completed remote builds in B14177: Diff 131198.Jan 23 2018, 9:31 PM

hintonda mentioned this in D41829: [cmake] WIP: Add cache file to bootstrap linux cross compile on Darwin..Jan 23 2018, 10:12 PM

compnerd accepted this revision.Jan 24 2018, 7:50 PM

This revision is now accepted and ready to land.Jan 24 2018, 7:50 PM

Herald added a subscriber: delcypher. · View Herald TranscriptJan 24 2018, 7:50 PM

Only call llvm_setup_rpath() if available is true.

Harbormaster completed remote builds in B14305: Diff 131690.Jan 27 2018, 11:59 AM

Closed by commit rL323606: [cmake] [compiler-rt] Call llvm_setup_rpath() when adding shared libraries. (authored by dhinton). · Explain WhyJan 27 2018, 1:17 PM

This revision was automatically updated to reflect the committed changes.

hvdijk mentioned this in D91099: [runtimes] Avoid overwriting the rpath unconditionally.Jun 22 2021, 6:29 AM

phosek added a reverting change: rG21c008d5a5b1: Revert "[cmake] [compiler-rt] Call llvm_setup_rpath() when adding shared….Jun 22 2021, 12:42 PM

Revision Contents

Path

Size

compiler-rt/

trunk/

cmake/

Modules/

AddCompilerRT.cmake

3 lines

Diff 131691

compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake

	Show First 20 Lines • Show All 241 Lines • ▼ Show 20 Lines		foreach(libname ${libnames})
	set_target_output_directories(${libname} ${COMPILER_RT_LIBRARY_OUTPUT_DIR})			set_target_output_directories(${libname} ${COMPILER_RT_LIBRARY_OUTPUT_DIR})
	set_target_properties(${libname} PROPERTIES			set_target_properties(${libname} PROPERTIES
	OUTPUT_NAME ${output_name_${libname}})			OUTPUT_NAME ${output_name_${libname}})
	set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime")			set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime")
	if(LIB_LINK_LIBS)			if(LIB_LINK_LIBS)
	target_link_libraries(${libname} ${LIB_LINK_LIBS})			target_link_libraries(${libname} ${LIB_LINK_LIBS})
	endif()			endif()
	if(${type} STREQUAL "SHARED")			if(${type} STREQUAL "SHARED")
				if(COMMAND llvm_setup_rpath)
				llvm_setup_rpath(${libname})
				endif()
	if(WIN32 AND NOT CYGWIN AND NOT MINGW)			if(WIN32 AND NOT CYGWIN AND NOT MINGW)
	set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")			set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
	set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")			set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
	endif()			endif()
	if(APPLE)			if(APPLE)
	# Ad-hoc sign the dylibs			# Ad-hoc sign the dylibs
	add_custom_command(TARGET ${libname}			add_custom_command(TARGET ${libname}
	POST_BUILD			POST_BUILD
	▲ Show 20 Lines • Show All 306 Lines • Show Last 20 Lines