Merge branch 'master' into edge

kozyilmaz · Oct 15, 2018 · bceb7ce · bceb7ce
2 parents 0712381 + f093185
commit bceb7ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
@@ -3,10 +3,13 @@ target_name ?= cmake
 
 include ../Makefile.build
 
-CMAKE_VERSION="3.12.0"
+CMAKE_MAJOR=3
+CMAKE_MINOR=12
+CMAKE_MICRO=3
+CMAKE_VERSION=$(CMAKE_MAJOR).$(CMAKE_MINOR).$(CMAKE_MICRO)
 
 cmake_clone:
-	if [ ! -f "cmake-$(CMAKE_VERSION).tar.gz" ]; then curl -OL https://cmake.org/files/v3.12/cmake-$(CMAKE_VERSION).tar.gz; fi;
+	if [ ! -f "cmake-$(CMAKE_VERSION).tar.gz" ]; then curl -OL https://cmake.org/files/v$(CMAKE_MAJOR).$(CMAKE_MINOR)/cmake-$(CMAKE_VERSION).tar.gz; fi;
 	if [ ! -d "cmake-$(CMAKE_VERSION)" ]; then tar xzf cmake-$(CMAKE_VERSION).tar.gz; fi
 
 cmake_config:
@@ -22,7 +25,7 @@ cmake_uninstall:
 	${BSPSUDO} make -C cmake-$(CMAKE_VERSION) uninstall
 
 cmake_clean:
-	if [ -f "cmake-$(CMAKE_VERSION)/Makefile" ]; then make -C cmake-$(CMAKE_VERSION) distclean; fi
+	if [ -f "cmake-$(CMAKE_VERSION)/Makefile" ]; then make -C cmake-$(CMAKE_VERSION) clean; fi
 
 cmake_distclean:
 	rm -rf cmake-$(CMAKE_VERSION)

diff --git a/tools/isl/Makefile b/tools/isl/Makefile
@@ -3,6 +3,7 @@ target_name ?= isl
 
 include ../Makefile.build
 
+# ISL v0.20 is released but gcc-8.2.0 has issues
 ISL_VERSION="0.19"
 
 isl_clone: