Browse Source

[silicon] clang-3.5

Matthieu Garrigues 9 years ago
parent
commit
3584dc51fd

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

@@ -5,7 +5,7 @@ fw_depends silicon lwan
 rm -rf build
 rm -rf build
 mkdir build
 mkdir build
 cd build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
 make silicon_lwan_mysql
 make silicon_lwan_mysql
 
 
 $TROOT/build/silicon_lwan_mysql ${DBHOST} 8080 &
 $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
 rm -rf build
 mkdir build
 mkdir build
 cd build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
 make silicon_epoll_mysql
 make silicon_epoll_mysql
 
 
 $TROOT/build/silicon_epoll_mysql ${DBHOST} 8080 ${MAX_THREADS} &
 $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
 rm -rf build
 mkdir build
 mkdir build
 cd build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
 make silicon_tpc_mysql
 make silicon_tpc_mysql
 
 
 $TROOT/build/silicon_tpc_mysql ${DBHOST} 8080 ${MAX_THREADS} &
 $TROOT/build/silicon_tpc_mysql ${DBHOST} 8080 ${MAX_THREADS} &

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

@@ -11,7 +11,7 @@ SILICON=$IROOT/silicon
 git clone https://github.com/matt-42/silicon.git
 git clone https://github.com/matt-42/silicon.git
 cd silicon;
 cd silicon;
 git checkout 383282990a0ba12f7a74cb9d2987c7666904b279
 git checkout 383282990a0ba12f7a74cb9d2987c7666904b279
-CXX=/usr/bin/clang++ ./install.sh $IROOT
+CXX=/usr/bin/clang++-3.5 ./install.sh $IROOT
 
 
 echo "" > $IROOT/silicon.installed
 echo "" > $IROOT/silicon.installed
 
 

+ 1 - 1
toolset/setup/linux/prerequisites.sh

@@ -65,7 +65,7 @@ sudo pip install requests
 # Install gcc-4.8, gcc-4.9 and clang
 # Install gcc-4.8, gcc-4.9 and clang
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 sudo apt-get -yq update
 sudo apt-get -yq update
-sudo apt-get install -qqy gcc-4.8 g++-4.8 gcc-4.9 g++-4.9 clang
+sudo apt-get install -qqy gcc-4.8 g++-4.8 gcc-4.9 g++-4.9 clang-3.5
 
 
 # Stop permanently overwriting people's files just for 
 # Stop permanently overwriting people's files just for 
 # trying out our software!
 # trying out our software!