summaryrefslogtreecommitdiffstats
path: root/support/dependencies
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2017-03-01 21:59:44 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-01 22:13:49 +0100
commit6593a0b98724dca490552758615ff31ced9f9e5e (patch)
tree1a20e76670bab27a19e6e33f59a0f60816f6f5c3 /support/dependencies
parent4d3556662deba0014d9368a84344a59b5e167fac (diff)
downloadbuildroot-6593a0b98724dca490552758615ff31ced9f9e5e.tar.gz
buildroot-6593a0b98724dca490552758615ff31ced9f9e5e.zip
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>
Diffstat (limited to 'support/dependencies')
-rwxr-xr-xsupport/dependencies/check-host-cmake.sh8
1 files changed, 0 insertions, 8 deletions
diff --git a/support/dependencies/check-host-cmake.sh b/support/dependencies/check-host-cmake.sh
index 84c26c25cd..9b63b0648d 100755
--- a/support/dependencies/check-host-cmake.sh
+++ b/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
OpenPOWER on IntegriCloud