Merge branch 'master' of github.com:tarantool/tarantool

cmake/compiler.cmake

@@ -41,7 +41,14 @@ endif()
 if((NOT HAVE_STD_C11 AND NOT HAVE_STD_GNU99) OR
    (NOT HAVE_STD_CXX11 AND NOT HAVE_STD_GNUXX0X))
     set(CMAKE_REQUIRED_FLAGS "-std=c11")
-    check_c_source_compiles("int main(void) { return 0; }" HAVE_STD_C11)
+    check_c_source_compiles("
+    /*
+     * FreeBSD 10 ctype.h header fail to compile on gcc4.8 in c11 mode.
+     * Make sure we aren't affected.
+     */
+    #include <ctype.h>
+    int main(void) { return 0; }
+    " HAVE_STD_C11)
     set(CMAKE_REQUIRED_FLAGS "-std=gnu99")
     check_c_source_compiles("int main(void) { return 0; }" HAVE_STD_GNU99)
     set(CMAKE_REQUIRED_FLAGS "-std=c++11")

cmake/luajit.cmake

@@ -170,6 +170,7 @@ macro(luajit_build)
         CFLAGS=""
         CXXFLAGS=""
         XCFLAGS="${luajit_xcflags}"
+        CC="${luajit_host_cc}"
         HOST_CC="${luajit_host_cc}"
         TARGET_CC="${luajit_target_cc}"
         CCOPT="${luajit_copt}")