Browse Source

[silicon] Fix installation of clang.

Matthieu Garrigues 9 years ago
parent
commit
1fc26dd9a4

+ 1 - 1
frameworks/C++/silicon/setup_lwan_mysql.sh

@@ -5,7 +5,7 @@ fw_depends silicon lwan
 rm -rf build
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.8
 make silicon_lwan_mysql
 
 $TROOT/build/silicon_lwan_mysql ${DBHOST} 8080 &

+ 1 - 1
frameworks/C++/silicon/setup_mhd_epoll_mysql.sh

@@ -5,7 +5,7 @@ fw_depends silicon microhttpd
 rm -rf build
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.8
 make silicon_epoll_mysql
 
 $TROOT/build/silicon_epoll_mysql ${DBHOST} 8080 ${MAX_THREADS} &

+ 1 - 1
frameworks/C++/silicon/setup_mhd_tpc_mysql.sh

@@ -5,7 +5,7 @@ fw_depends silicon microhttpd
 rm -rf build
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.8
 make silicon_tpc_mysql
 
 $TROOT/build/silicon_tpc_mysql ${DBHOST} 8080 ${MAX_THREADS} &

+ 1 - 1
toolset/setup/linux/frameworks/silicon.sh

@@ -12,7 +12,7 @@ git clone https://github.com/matt-42/silicon.git
 cd silicon;
 # May 18th, 2016
 git checkout 73dac7f3c8dcd4f9c53713456e8b73165006e968
-CXX=clang++-3.5 ./install.sh $IROOT
+CXX=clang++-3.8 ./install.sh $IROOT
 
 echo "" > $IROOT/silicon.installed
 

+ 9 - 2
toolset/setup/linux/prerequisites.sh

@@ -62,10 +62,17 @@ sudo pip install colorama==0.3.1
 sudo pip install progressbar==2.2
 sudo pip install requests
 
-# Install gcc-4.8, gcc-4.9 and clang
+# Install gcc-4.8, gcc-4.9
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 sudo apt-get -yq update
-sudo apt-get install -qqy gcc-4.8 g++-4.8 gcc-4.9 g++-4.9 clang-3.5
+sudo apt-get install -qqy gcc-4.8 g++-4.8 gcc-4.9 g++-4.9
+
+# Install Clang, needed by silicon.
+sudo deb http://apt.llvm.org/$TFB_DISTRIB_CODENAME/ llvm-toolchain-$TFB_DISTRIB_CODENAME-3.8 main
+sudo deb-src http://apt.llvm.org/$TFB_DISTRIB_CODENAME/ llvm-toolchain-$TFB_DISTRIB_CODENAME-3.8 main
+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+sudo apt-get -yq update
+sudo apt-get install -qqy clang-3.8
 
 # Stop permanently overwriting people's files just for 
 # trying out our software!