Revert "dependencies/cmake: blacklist cmake 3.7"
authorYann E. MORIN <yann.morin.1998@free.fr>
Wed, 1 Mar 2017 20:59:44 +0000 (21:59 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 1 Mar 2017 21:13:49 +0000 (22:13 +0100)
This reverts commit 4422eca2d418e2b817b419ff6c4c62f7f4cb7871.

We now have a workaround for the RPATH issue introduced in 3.7, so we
can use it again.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
support/dependencies/check-host-cmake.sh

index 84c26c25cdfa4324b0c25070c99bd6ee2e32dc3f..9b63b0648d97b28bb243f2b83e25e0799d775c75 100755 (executable)
@@ -6,9 +6,6 @@ version_min="${2}"
 major_min="${version_min%.*}"
 minor_min="${version_min#*.}"
 
-# cmake-3.7 incorrectly handles rpath, linking to host libraries
-blacklist_version="3.7"
-
 cmake=`which ${candidate}`
 if [ ! -x "${cmake}" ]; then
     # echo nothing: no suitable cmake found
@@ -30,11 +27,6 @@ version="$(${cmake} --version \
 major="${version%.*}"
 minor="${version#*.}"
 
-if [ "${version}" = "${blacklist_version}" ]; then
-    # echo nothing: no suitable cmake found
-    exit 1
-fi
-
 if [ ${major} -gt ${major_min} ]; then
     echo "${cmake}"
 else