Merge pull request #2602 from michaelhixson/avoid-sudo-make-installs

Avoid "sudo make install", which breaks some frameworks

toolset/setup/linux/frameworks/cutelyst.sh

@@ -32,7 +32,7 @@ mkdir build && cd build
 
 cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$IROOT -DUSE_JEMALLOC=on
 
-make -j $MAX_THREADS && sudo make install
+make -j $MAX_THREADS && make install
 
 echo "QT_VERSION_MM=${QT_VERSION_MM}" > $IROOT/cutelyst.installed
 

toolset/setup/linux/frameworks/urweb.sh

@@ -10,9 +10,9 @@ RETCODE=$(fw_exists ${COMPILER}.installed)
   fw_get -O http://www.impredicative.com/ur/urweb-$VERSION.tgz
   fw_untar urweb-$VERSION.tgz
   cd urweb-$VERSION
-  sudo ./configure --prefix=$IROOT/urweb
-  sudo make
-  sudo make install
+  ./configure --prefix=$IROOT/urweb
+  make
+  make install
 
   echo "export URWEB_HOME=${COMPILER}" > $COMPILER.installed
   echo "export LD_LIBRARY_PATH=${COMPILER}/lib" >> $COMPILER.installed

toolset/setup/linux/languages/swift3.sh

@@ -7,7 +7,9 @@ fw_depends clang-3.9
 sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.9 100
 sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.9 100
 
-fw_depends cmake-3.5
+sudo apt-add-repository --yes ppa:george-edison55/cmake-3.x
+sudo apt-get update -qq
+sudo apt-get install -qqy cmake
 
 SWIFT_SNAPSHOT="swift-3.0.2-RELEASE"
 SWIFT_SNAPSHOT_LOWERCASE="swift-3.0.2-release"

toolset/setup/linux/systools/cmake-3.5.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-fw_installed cmake-3.5 && return 0
-
-fw_get -O http://www.cmake.org/files/v3.5/cmake-3.5.2.tar.gz
-fw_untar cmake-3.5.2.tar.gz
-cd cmake-3.5.2
-./configure
-make
-sudo make install
-sudo update-alternatives --install /usr/bin/cmake cmake /usr/local/bin/cmake 1 --force
-
-echo -e "" >> $IROOT/cmake-3.5.installed
-
-source $IROOT/cmake-3.5.installed