Skip to content

Commit 33c6d9a

Browse files
committed
scripts/bootstrap-prefix: use newer cmake too bootstrap
Signed-off-by: Alexey Sokolov <[email protected]> Signed-off-by: Fabian Groffen <[email protected]>
1 parent 67ca303 commit 33c6d9a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

scripts/bootstrap-prefix.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -1176,18 +1176,19 @@ bootstrap_cmake_core() {
11761176

11771177
# we need sysroot crap to build cmake itself, but it makes trouble
11781178
# later on, so kill it in the installed version
1179-
ver=${A%-*} ; ver=${ver%.*}
11801179
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
1181-
"${ROOT}/tmp/usr/share/${ver}/Modules/Platform"/Apple-GNU-*.cmake || die
1180+
"${ROOT}"/tmp/usr/share/cmake*/Modules/Platform/Apple-GNU-*.cmake || die
11821181
# disable isysroot usage with clang as well
11831182
sed -i -e '/_SYSROOT_FLAG/d' \
1184-
"${ROOT}/tmp/usr/share/${ver}/Modules/Platform"/Apple-Clang.cmake || die
1183+
"${ROOT}"/tmp/usr/share/cmake*/Modules/Platform/Apple-Clang.cmake || die
11851184

11861185
einfo "${A%.tar.*} bootstrapped"
11871186
}
11881187

11891188
bootstrap_cmake() {
1190-
bootstrap_cmake_core 3.16.5 || bootstrap_cmake_core 3.0.2
1189+
bootstrap_cmake_core 3.20.6 || \
1190+
bootstrap_cmake_core 3.16.5 || \
1191+
bootstrap_cmake_core 3.0.2
11911192
}
11921193

11931194
bootstrap_zlib_core() {

0 commit comments

Comments
 (0)