ARROW-1615 Identify compiler version for clang-802 plus more warning …

…entries
wesm · Sep 29, 2017 · 9d3c7ec · 9d3c7ec
1 parent 5ebaf86
commit 9d3c7ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/cpp/cmake_modules/CompilerInfo.cmake b/cpp/cmake_modules/CompilerInfo.cmake
@@ -63,6 +63,11 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-7")
   set(COMPILER_FAMILY "clang")
   set(COMPILER_VERSION "3.7.0svn")
 
+# clang on Mac OS X, XCode 8.
+elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-802")
+  set(COMPILER_FAMILY "clang")
+  set(COMPILER_VERSION "3.9.0svn")
+
 # clang on Mac OS X, XCode 8.
 elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-8")
   set(COMPILER_FAMILY "clang")

diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake
@@ -77,12 +77,15 @@ if ("${UPPERCASE_BUILD_WARNING_LEVEL}" STREQUAL "CHECKIN")
     -Wno-implicit-fallthrough -Wno-old-style-cast -Wno-unreachable-code-return \
     -Wno-float-equal -Wno-missing-prototypes -Wno-non-virtual-dtor \
     -Wno-unused-macros -Wno-covered-switch-default -Wno-unreachable-code-break \
-    -Wno-extra-semi -Wno-shift-sign-overflow \
+    -Wno-extra-semi -Wno-shorten-64-to-32 -Wno-shift-sign-overflow \
     -Wno-used-but-marked-unused -Wno-missing-variable-declarations \
     -Wno-gnu-zero-variadic-macro-arguments -Wconversion -Wno-sign-conversion \
     -Wno-disabled-macro-expansion -Wc++11-narrowing -Wnarrowing")
 
     # Version numbers where warnings are introduced
+    if ("${COMPILER_VERSION}" VERSION_GREATER "3.3")
+      set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-gnu-folding-constant")
+    endif()
     if ("${COMPILER_VERSION}" VERSION_GREATER "3.6")
       set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-reserved-id-macro")
       set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-range-loop-analysis")
@@ -140,12 +143,15 @@ else()
     -Wno-implicit-fallthrough -Wno-old-style-cast -Wno-unreachable-code-return \
     -Wno-float-equal -Wno-missing-prototypes -Wno-non-virtual-dtor \
     -Wno-unused-macros -Wno-covered-switch-default -Wno-unreachable-code-break \
-    -Wno-extra-semi -Wno-shift-sign-overflow \
+    -Wno-extra-semi -Wno-shorten-64-to-32 -Wno-shift-sign-overflow \
     -Wno-used-but-marked-unused -Wno-missing-variable-declarations \
     -Wno-gnu-zero-variadic-macro-arguments -Wconversion -Wno-sign-conversion \
     -Wno-disabled-macro-expansion -Wc++11-narrowing -Wnarrowing")
 
     # Version numbers where warnings are introduced
+    if ("${COMPILER_VERSION}" VERSION_GREATER "3.3")
+      set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-gnu-folding-constant")
+    endif()
     if ("${COMPILER_VERSION}" VERSION_GREATER "3.6")
       set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-reserved-id-macro")
       set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-range-loop-analysis")