Browse Source

[silicon] Fix install.sh chmod. Switch back to clang.

Matthieu Garrigues 9 years ago
parent
commit
65c69bf765

+ 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=g++-4.9
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
 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=g++-4.9
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
 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=g++-4.9
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
 make silicon_tpc_mysql
 
 $TROOT/build/silicon_tpc_mysql ${DBHOST} 8080 ${MAX_THREADS} &

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

@@ -10,8 +10,8 @@ SILICON=$IROOT/silicon
 
 git clone https://github.com/matt-42/silicon.git
 cd silicon;
-git checkout 383282990a0ba12f7a74cb9d2987c7666904b279
-CXX=g++-4.9 ./install.sh $IROOT
+git checkout a2b930696a72aa963056f21b1605adfe8ec1a8a7
+CXX=clang++-3.5 ./install.sh $IROOT
 
 echo "" > $IROOT/silicon.installed