| 1 |
commit: 385fc99384fe36e940a814545e9e85ccba2d4ef4 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 22 16:02:01 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 2 14:50:43 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385fc993 |
| 7 |
|
| 8 |
cmake-utils.eclass: check for ninja with ROOT=/ |
| 9 |
|
| 10 |
Gentoo-bug: 577244 |
| 11 |
|
| 12 |
eclass/cmake-utils.eclass | 2 +- |
| 13 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 16 |
index 5f7bb81..ebcb631 100644 |
| 17 |
--- a/eclass/cmake-utils.eclass |
| 18 |
+++ b/eclass/cmake-utils.eclass |
| 19 |
@@ -242,7 +242,7 @@ _cmake_generator_to_use() { |
| 20 |
ninja) |
| 21 |
# if ninja is enabled but not installed, the build could fail |
| 22 |
# this could happen if ninja is manually enabled (eg. make.conf) but not installed |
| 23 |
- if ! has_version dev-util/ninja; then |
| 24 |
+ if ! ROOT=/ has_version dev-util/ninja; then |
| 25 |
die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR." |
| 26 |
fi |
| 27 |
generator_name="Ninja" |
Archives