Browse Source

C++/silicon framework fix

Nate Brady 8 years ago
parent
commit
047f3b53a7

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

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

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends libboost-dev clang-3.8 gcc-4.9
+fw_depends libboost-dev clang-3.9 gcc-4.9
 
 RETCODE=$(fw_exists ${IROOT}/silicon.installed)
 [ ! "$RETCODE" == 0 ] || { \
@@ -12,9 +12,9 @@ SILICON=$IROOT/silicon
 
 git clone https://github.com/matt-42/silicon.git
 cd silicon;
-# May 18th, 2016
-git checkout 73dac7f3c8dcd4f9c53713456e8b73165006e968
-CC=clang-3.8 CXX=clang++-3.8 ./install.sh $IROOT
+# December 28th, 2016
+git checkout 1fed7cead9490e3054af730ac9bf04ae4cf5009d
+CC=clang-3.9 CXX=clang++-3.9 ./install.sh $IROOT
 
 echo "" > $IROOT/silicon.installed
 

+ 0 - 1
toolset/setup/linux/systools/clang-3.9.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 RETCODE=$(fw_exists ${IROOT}/clang-3.9.installed)
 [ ! "$RETCODE" == 0 ] || { \
   source $IROOT/clang-3.9.installed

+ 0 - 0
toolset/travis/should-run.py