Browse Source

Revert "dependencies/cmake: blacklist cmake 3.7"

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>
Yann E. MORIN 8 years ago
parent
commit
6593a0b987
1 changed files with 0 additions and 8 deletions
  1. 0 8
      support/dependencies/check-host-cmake.sh

+ 0 - 8
support/dependencies/check-host-cmake.sh

@@ -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