Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 503216 | Differences between
and this patch

Collapse All | Expand All

(-)cmake-utils.eclass.orig (+23 lines)
Lines 440-445 Link Here
440
		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
440
		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
441
		SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE)
441
		SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE)
442
		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
442
		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
443
		SET (CMAKE_LINKER $(type -P $(tc-getLD)) CACHE FILEPATH "Linker" FORCE)
443
		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
444
		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
444
		SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE)
445
		SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE)
445
	_EOF_
446
	_EOF_
Lines 493-498 Link Here
493
		local warn_unused_cli=""
494
		local warn_unused_cli=""
494
	fi
495
	fi
495
496
497
	if tc-is-cross-compiler; then
498
		local sysname
499
		case "${KERNEL}" in
500
			Cygwin) sysname="CYGWIN_NT-5.1" ;;
501
			HPUX) sysname="HP-UX" ;;
502
			linux) sysname="Linux" ;;
503
			Winnt) sysname="Windows" ;;
504
			*) sysname="${KERNEL}" ;;
505
		esac
506
507
		local toolchain_file=${BUILD_DIR}/toolchain_file.cmake
508
		cat > "${toolchain_file}" <<- _EOF_
509
			SET (CMAKE_SYSTEM_NAME "${sysname}")
510
			SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)))
511
			SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)))
512
		_EOF_
513
514
		mycmakeargs_local+=(
515
			-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
516
		)
517
	fi
518
496
	# Common configure parameters (overridable)
519
	# Common configure parameters (overridable)
497
	# NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable
520
	# NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable
498
	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
521
	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.

Return to bug 503216