Browse Source

Update the silicon framework (#2640)

* silicon: link lwan with the ubsan lib.

* silicon: update to the last version.

* silicon: Retrigger travis after IOD update.
Matthieu Garrigues 8 years ago
parent
commit
b76a1908f7

+ 1 - 1
frameworks/C++/silicon/CMakeLists.txt

@@ -16,4 +16,4 @@ set_target_properties(silicon_epoll_mysql PROPERTIES COMPILE_FLAGS "-DTFB_USE_EP
 target_link_libraries(silicon_epoll_mysql microhttpd mysqlclient)
 target_link_libraries(silicon_epoll_mysql microhttpd mysqlclient)
 
 
 add_executable(silicon_lwan_mysql techempower_lwan.cc)
 add_executable(silicon_lwan_mysql techempower_lwan.cc)
-target_link_libraries(silicon_lwan_mysql mysqlclient lwan curl z pthread dl luajit-5.1)
+target_link_libraries(silicon_lwan_mysql mysqlclient lwan ubsan curl z pthread dl luajit-5.1)

+ 0 - 1
frameworks/C++/silicon/techempower.hh

@@ -41,7 +41,6 @@ std::string escape_html_entities(std::string& data)
 
 
 auto techempower_api = http_api(
 auto techempower_api = http_api(
 
 
-
   GET / _plaintext = [] () { return response(_content_type = string_ref("text/plain"),
   GET / _plaintext = [] () { return response(_content_type = string_ref("text/plain"),
                                        _body = string_ref("Hello, World!")); },
                                        _body = string_ref("Hello, World!")); },
 
 

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

@@ -8,8 +8,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;
-# December 28th, 2016
-git checkout 1fed7cead9490e3054af730ac9bf04ae4cf5009d
+git checkout ecaf04887c9dbbf0f457afab1f487268f6aeffab
 CC=clang-3.9 CXX=clang++-3.9 ./install.sh $IROOT
 CC=clang-3.9 CXX=clang++-3.9 ./install.sh $IROOT
 
 
 echo "" > $IROOT/silicon.installed
 echo "" > $IROOT/silicon.installed