This is an archive of the discontinued LLVM Phabricator instance.

Fix building with in-tree libc++abi on FreeBSD
ClosedPublic

Authored by kutuzov.viktor.84 on Jul 31 2014, 10:00 AM.

Reviewers

danalbert
samsonov

Commits

rL214541: Fix building with in-tree libc++abi on FreeBSD

Summary

Completes the support for linking against in-tree libc++abi added in rL214037 and rL214114.

kutuzov.viktor.84 retitled this revision from to Fix building with in-tree libc++abi on FreeBSD.

kutuzov.viktor.84 updated this object.

kutuzov.viktor.84 edited the test plan for this revision. (Show Details)

kutuzov.viktor.84 added subscribers: Unknown Object (MLST), emaste.

LGTM

This revision is now accepted and ready to land.Jul 31 2014, 11:52 AM

Closed by commit rL214541 (authored by vkutuzov).

Path

Size

llvm/

trunk/

1 line

	Show First 20 Lines • Show All 455 Lines • ▼ Show 20 Lines
	if (APPLE)			if (APPLE)
	set(CMAKE_INSTALL_NAME_DIR "@rpath")			set(CMAKE_INSTALL_NAME_DIR "@rpath")
	set(CMAKE_INSTALL_RPATH "@executable_path/../lib")			set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
	else(UNIX)			else(UNIX)
	if(NOT DEFINED CMAKE_INSTALL_RPATH)			if(NOT DEFINED CMAKE_INSTALL_RPATH)
	set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")			set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
	if (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)			if (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,origin")			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,origin")
				set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,origin")
	endif()			endif()
	endif(NOT DEFINED CMAKE_INSTALL_RPATH)			endif(NOT DEFINED CMAKE_INSTALL_RPATH)
	endif()			endif()

	set(CMAKE_INCLUDE_CURRENT_DIR ON)			set(CMAKE_INCLUDE_CURRENT_DIR ON)

	include_directories( ${LLVM_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR})			include_directories( ${LLVM_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR})

	▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines