diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-10-15 22:16:42 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-10-15 22:24:36 +1100 |
| commit | 1ebdc4b2bedf79956f3c8a9b2cbf6030e37f9f2b (patch) | |
| tree | 906bbb96df0f18efbe945941f63dd9bf7aa2c435 /eclass | |
| parent | cmake-utils.eclass Set CMAKE_RC_COMPILER for Windows builds (diff) | |
| download | gentoo-1ebdc4b2bedf79956f3c8a9b2cbf6030e37f9f2b.tar.gz gentoo-1ebdc4b2bedf79956f3c8a9b2cbf6030e37f9f2b.tar.bz2 gentoo-1ebdc4b2bedf79956f3c8a9b2cbf6030e37f9f2b.zip | |
cmake-utils.eclass: make heredocs die
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 8ec0fa6adb82..948b838358e4 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -376,7 +376,7 @@ _modify-cmakelists() { || die "${LINENO}: failed to disable hardcoded settings" # NOTE Append some useful summary here - cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ + cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die MESSAGE(STATUS "<<< Gentoo configuration >>> Build type \${CMAKE_BUILD_TYPE} @@ -457,7 +457,7 @@ enable_cmake-utils_src_configure() { # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.) local build_rules=${BUILD_DIR}/gentoo_rules.cmake - cat > "${build_rules}" <<- _EOF_ + cat > "${build_rules}" <<- _EOF_ || die SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) @@ -468,7 +468,7 @@ enable_cmake-utils_src_configure() { _EOF_ local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake - cat > ${toolchain_file} <<- _EOF_ + cat > ${toolchain_file} <<- _EOF_ || die SET (CMAKE_C_COMPILER $(tc-getCC)) SET (CMAKE_CXX_COMPILER $(tc-getCXX)) SET (CMAKE_Fortran_COMPILER $(tc-getFC)) @@ -489,14 +489,14 @@ enable_cmake-utils_src_configure() { *) sysname="${KERNEL}" ;; esac - cat >> "${toolchain_file}" <<- _EOF_ + cat >> "${toolchain_file}" <<- _EOF_ || die SET (CMAKE_SYSTEM_NAME "${sysname}") _EOF_ if [ "${SYSROOT:-/}" != "/" ] ; then # When cross-compiling with a sysroot (e.g. with crossdev's emerge wrappers) # we need to tell cmake to use libs/headers from the sysroot but programs from / only. - cat >> "${toolchain_file}" <<- _EOF_ + cat >> "${toolchain_file}" <<- _EOF_ || die set(CMAKE_FIND_ROOT_PATH "${SYSROOT}") set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) @@ -508,7 +508,7 @@ enable_cmake-utils_src_configure() { has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= if [[ ${EPREFIX} ]]; then - cat >> "${build_rules}" <<- _EOF_ + cat >> "${build_rules}" <<- _EOF_ || die # in Prefix we need rpath and must ensure cmake gets our default linker path # right ... except for Darwin hosts IF (NOT APPLE) @@ -533,7 +533,7 @@ enable_cmake-utils_src_configure() { # Common configure parameters (invariants) local common_config=${BUILD_DIR}/gentoo_common_config.cmake local libdir=$(get_libdir) - cat > "${common_config}" <<- _EOF_ + cat > "${common_config}" <<- _EOF_ || die SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE) SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries") _EOF_ |