Merge branch 'warning-fix'

CMakeLists.txt

@@ -184,6 +184,9 @@ if (ENABLE_STATIC)
     add_compile_flags("C;CXX" "-static")
 endif()
 
+# Compile with builtin libgcc by default.
+add_compile_flags("C;CXX;OBJC;OBJCXX" "-static-libgcc")
+
 ##
 ## Third-Party libraries
 ##

connector/c/tnt/CMakeLists.txt

@@ -44,8 +44,11 @@ set (tnt_sources
 
 # Here we manage to build static/dynamic libraries ourselves,
 # do not use the top level settings.
+string(REPLACE "-static-libgcc" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 string(REPLACE "-static" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
+set (tnt_cflags "${tnt_cflags} -static-libgcc")
+
 #
 # Static library
 #

connector/c/tntnet/CMakeLists.txt

@@ -35,8 +35,11 @@ set (tntnet_sources
 
 # Here we manage to build static/dynamic libraries ourselves,
 # do not use the top level settings.
+string(REPLACE "-static-libgcc" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 string(REPLACE "-static" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
+set (tnt_cflags "${tnt_cflags} -static-libgcc")
+
 #
 # Static library
 #

connector/c/tntrpl/CMakeLists.txt

@@ -32,8 +32,11 @@ set (tntrpl_sources tnt_log.c tnt_dir.c tnt_xlog.c tnt_snapshot.c tnt_rpl.c
 
 # Here we manage to build static/dynamic libraries ourselves,
 # do not use the top level settings.
+string(REPLACE "-static-libgcc" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 string(REPLACE "-static" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
+set (tnt_cflags "${tnt_cflags} -static-libgcc")
+
 #
 # Static library
 #

connector/c/tntsql/CMakeLists.txt

@@ -34,8 +34,11 @@ set (tntsql_sources
 
 # Here we manage to build static/dynamic libraries ourselves,
 # do not use the top level settings.
+string(REPLACE "-static-libgcc" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 string(REPLACE "-static" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
+set (tnt_cflags "${tnt_cflags} -static-libgcc")
+
 #
 # Static library
 #