diff --git a/autobuild.xml b/autobuild.xml
index 16a7ac119690868148e808e938195b8e58424cf6..034f6fe3ab438ca92d17cb3db3114e6948578364 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3559,139 +3559,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>linux</key>
<map>
<key>build_directory</key>
- <string>build-linux-i686</string>
- <key>configurations</key>
- <map>
- <key>Debug</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>ninja</string>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Ninja'</string>
- </array>
- </map>
- <key>name</key>
- <string>Debug</string>
- </map>
- <key>DebugOS</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>ninja</string>
- </map>
- <key>configure</key>
- <map>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Ninja'</string>
- </array>
- </map>
- <key>name</key>
- <string>DebugOS</string>
- </map>
- <key>RelWithDebInfo</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>ninja</string>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Ninja'</string>
- </array>
- </map>
- <key>default</key>
- <string>True</string>
- <key>name</key>
- <string>RelWithDebInfo</string>
- </map>
- <key>RelWithDebInfoOS</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>ninja</string>
- </map>
- <key>configure</key>
- <map>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Ninja'</string>
- </array>
- </map>
- <key>name</key>
- <string>RelWithDebInfoOS</string>
- </map>
- <key>Release</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>ninja</string>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Ninja'</string>
- </array>
- </map>
- <key>name</key>
- <string>Release</string>
- </map>
- <key>ReleaseOS</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>ninja</string>
- </map>
- <key>configure</key>
- <map>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Ninja'</string>
- </array>
- </map>
- <key>name</key>
- <string>ReleaseOS</string>
- </map>
- </map>
- <key>name</key>
- <string>linux</string>
- </map>
- <key>linux64</key>
- <map>
- <key>build_directory</key>
- <string>build-linux-x86_64</string>
+ <string>build-linux-$AUTOBUILD_ADDRSIZE</string>
<key>configurations</key>
<map>
<key>Coverity</key>
@@ -3713,7 +3581,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<array>
<string>-G</string>
<string>"Ninja"</string>
- <string>-DADDRESS_SIZE:STRING=64</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
</array>
</map>
<key>name</key>
@@ -3735,8 +3603,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-G</string>
- <string>'Ninja'</string>
- <string>-DADDRESS_SIZE:STRING=64</string>
+ <string>Ninja</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
</array>
</map>
<key>name</key>
@@ -3754,8 +3622,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-G</string>
- <string>'Ninja'</string>
- <string>-DADDRESS_SIZE:STRING=64</string>
+ <string>Ninja</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
</array>
</map>
<key>name</key>
@@ -3777,8 +3645,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-G</string>
- <string>'Ninja'</string>
- <string>-DADDRESS_SIZE:STRING=64</string>
+ <string>Ninja</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
</array>
</map>
<key>default</key>
@@ -3798,7 +3666,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-G</string>
- <string>'Ninja'</string>
+ <string>Ninja</string>
<string>-DADDRESS_SIZE:STRING=64</string>
</array>
</map>
@@ -3821,8 +3689,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-G</string>
- <string>'Ninja'</string>
- <string>-DADDRESS_SIZE:STRING=64</string>
+ <string>Ninja</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
</array>
</map>
<key>name</key>
@@ -3840,8 +3708,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-G</string>
- <string>'Ninja'</string>
- <string>-DADDRESS_SIZE:STRING=64</string>
+ <string>Ninja</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
</array>
</map>
<key>name</key>
@@ -3849,7 +3717,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
</map>
</map>
<key>name</key>
- <string>linux64</string>
+ <string>linux</string>
</map>
<key>windows</key>
<map>
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 21c11028340f850a3d7b14c15578a2d513c5c347..8e111ee6625349d35096830dcbc1fb9cce93e04b 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -16,7 +16,7 @@
if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
-include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
include(Variables)
# Portable compilation flags.
@@ -188,9 +188,9 @@ if (LINUX)
-fno-math-errno
-fno-strict-aliasing
-fsigned-char
- -std=gnu++14
-g
-pthread
+ -msse4.2
)
add_definitions(
@@ -229,9 +229,9 @@ if (LINUX)
endif (USE_THDSAN)
endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- CHECK_C_COMPILER_FLAG(-Og HAS_DEBUG_OPTIMIZATION)
- CHECK_C_COMPILER_FLAG(-fstack-protector-strong HAS_STRONG_STACK_PROTECTOR)
- CHECK_C_COMPILER_FLAG(-fstack-protector HAS_STACK_PROTECTOR)
+ CHECK_CXX_COMPILER_FLAG(-Og HAS_DEBUG_OPTIMIZATION)
+ CHECK_CXX_COMPILER_FLAG(-fstack-protector-strong HAS_STRONG_STACK_PROTECTOR)
+ CHECK_CXX_COMPILER_FLAG(-fstack-protector HAS_STACK_PROTECTOR)
if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
if(HAS_STRONG_STACK_PROTECTOR)
add_compile_options(-fstack-protector-strong)
@@ -244,7 +244,6 @@ if (LINUX)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
if (ADDRESS_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
add_compile_options(
- -msse2
-mfpmath=sse
-march=pentium4)
endif (ADDRESS_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
@@ -260,9 +259,9 @@ if (LINUX)
else (HAS_DEBUG_OPTIMIZATION)
set(CMAKE_CXX_FLAGS_RELEASE "-O1 -fno-omit-frame-pointer ${CMAKE_CXX_FLAGS_RELEASE}")
endif (HAS_DEBUG_OPTIMIZATION)
- else (USE_ASAN OR USE_LEAKSAN OR USE_UBSAN OR USE_THDSAN)
+ else ()
set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
- endif (USE_ASAN OR USE_LEAKSAN OR USE_UBSAN OR USE_THDSAN)
+ endif ()
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if (ADDRESS_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
add_compile_options(-msse2 -march=pentium4)
@@ -284,7 +283,6 @@ if (LINUX)
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro -Wl,-z,now -Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
endif (LINUX)
-
if (DARWIN)
add_definitions(-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION)
set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
@@ -318,8 +316,8 @@ if (LINUX OR DARWIN)
endif (NOT UNIX_DISABLE_FATAL_WARNINGS)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- set(UNIX_WARNINGS "-Wall -Wno-unused-variable -Wno-maybe-uninitialized ${UNIX_WARNINGS} ")
- set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder")
+ set(UNIX_WARNINGS "-Wall -Wno-unused-variable -Wno-maybe-uninitialized -Wno-sign-compare -Wno-attributes ${UNIX_WARNINGS}")
+ set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder -Wno-unused-local-typedefs")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
set(UNIX_WARNINGS "-Wall ${UNIX_WARNINGS} ")
set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-unused-local-typedef -Wempty-body -Wunreachable-code -Wundefined-bool-conversion -Wenum-conversion -Wassign-enum -Wint-conversion -Wconstant-conversion -Wnewline-eof -Wno-protocol -Wno-tautological-type-limit-compare -Wno-unused-template -Wno-undef")