Skip to content

Commit

Permalink
eclass/cmake-utils: switch Darwin to rpath mode, bug #642668
Browse files Browse the repository at this point in the history
By Michael Weiser, relying on the other support that enables @rpath
entries, supported in macOS 10.5 and up.

Closes: https://bugs.gentoo.org/642668
  • Loading branch information
grobian committed Jan 2, 2018
1 parent bcbd83c commit 995aa8f
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions eclass/cmake-utils.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -586,12 +586,10 @@ cmake-utils_src_configure() {
ELSE ()
SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "")
SET(CMAKE_INSTALL_RPATH "${EPREFIX}/usr/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE)
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}/usr/lib" CACHE STRING "" FORCE)
ENDIF (NOT APPLE)
_EOF_
Expand Down

0 comments on commit 995aa8f

Please sign in to comment.