mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "dependencies/cmake: blacklist cmake 3.7"

Browse Source 
This reverts commit 4422eca2d4.

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>
This commit is contained in:
Yann E. MORIN
2017-03-01 21:59:44 +01:00
committed by Thomas Petazzoni
parent 4d3556662d
commit 6593a0b987
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
support/dependencies/check-host-cmake.sh
View File

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