Remove some trash from build

CMakeLists.txt

@@ -541,8 +541,6 @@ include (cmake/find/mysqlclient.cmake)
 
 # When testing for memory leaks with Valgrind, don't link tcmalloc or jemalloc.
 
-include (cmake/print_flags.cmake)
-
 if (TARGET global-group)
     install (EXPORT global DESTINATION cmake)
 endif ()
@@ -594,6 +592,7 @@ include_directories(${ConfigIncludePath})
 
 # Add as many warnings as possible for our own code.
 include (cmake/warnings.cmake)
+include (cmake/print_flags.cmake)
 
 add_subdirectory (base)
 add_subdirectory (src)

cmake/warnings.cmake

@@ -26,46 +26,6 @@ if (COMPILER_CLANG)
     no_warning(zero-length-array)
     no_warning(c11-extensions)
 
-    add_warning(comma)
-    add_warning(conditional-uninitialized)
-    add_warning(covered-switch-default)
-    add_warning(deprecated)
-    add_warning(embedded-directive)
-    add_warning(empty-init-stmt) # linux-only
-    add_warning(extra-semi-stmt) # linux-only
-    add_warning(extra-semi)
-    add_warning(gnu-case-range)
-    add_warning(inconsistent-missing-destructor-override)
-    add_warning(newline-eof)
-    add_warning(old-style-cast)
-    add_warning(range-loop-analysis)
-    add_warning(redundant-parens)
-    add_warning(reserved-id-macro)
-    add_warning(shadow-field)
-    add_warning(shadow-uncaptured-local)
-    add_warning(shadow)
-    add_warning(string-plus-int)
-    add_warning(undef)
-    add_warning(unreachable-code-return)
-    add_warning(unreachable-code)
-    add_warning(unused-exception-parameter)
-    add_warning(unused-macros)
-    add_warning(unused-member-function)
-    add_warning(unneeded-internal-declaration)
-    add_warning(implicit-int-float-conversion)
-    add_warning(no-delete-null-pointer-checks)
-    add_warning(anon-enum-enum-conversion)
-    add_warning(assign-enum)
-    add_warning(bitwise-op-parentheses)
-    add_warning(int-in-bool-context)
-    add_warning(sometimes-uninitialized)
-    add_warning(tautological-bitwise-compare)
-
-    # XXX: libstdc++ has some of these for 3way compare
-    if (USE_LIBCXX)
-        add_warning(zero-as-null-pointer-constant)
-    endif()
-
     if (WEVERYTHING)
         add_warning(everything)
         no_warning(c++98-compat-pedantic)
@@ -101,6 +61,47 @@ if (COMPILER_CLANG)
         endif()
 
         # TODO Enable conversion, sign-conversion, double-promotion warnings.
+    else ()
+        add_warning(comma)
+        add_warning(conditional-uninitialized)
+        add_warning(covered-switch-default)
+        add_warning(deprecated)
+        add_warning(embedded-directive)
+        add_warning(empty-init-stmt) # linux-only
+        add_warning(extra-semi-stmt) # linux-only
+        add_warning(extra-semi)
+        add_warning(gnu-case-range)
+        add_warning(inconsistent-missing-destructor-override)
+        add_warning(newline-eof)
+        add_warning(old-style-cast)
+        add_warning(range-loop-analysis)
+        add_warning(redundant-parens)
+        add_warning(reserved-id-macro)
+        add_warning(shadow-field)
+        add_warning(shadow-uncaptured-local)
+        add_warning(shadow)
+        add_warning(string-plus-int)
+        add_warning(undef)
+        add_warning(unreachable-code-return)
+        add_warning(unreachable-code)
+        add_warning(unused-exception-parameter)
+        add_warning(unused-macros)
+        add_warning(unused-member-function)
+        add_warning(unneeded-internal-declaration)
+        add_warning(implicit-int-float-conversion)
+        add_warning(no-delete-null-pointer-checks)
+        add_warning(anon-enum-enum-conversion)
+        add_warning(assign-enum)
+        add_warning(bitwise-op-parentheses)
+        add_warning(int-in-bool-context)
+        add_warning(sometimes-uninitialized)
+        add_warning(tautological-bitwise-compare)
+
+        # XXX: libstdc++ has some of these for 3way compare
+        if (USE_LIBCXX)
+            add_warning(zero-as-null-pointer-constant)
+        endif()
+
     endif ()
 elseif (COMPILER_GCC)
     # Add compiler options only to c++ compiler

src/Storages/System/StorageSystemContributors.sh

@@ -2,8 +2,6 @@
 
 set -x
 
-LC_ALL=C
-
 # doesn't actually cd to directory, but return absolute path
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # cd to directory
@@ -12,7 +10,7 @@ cd $CUR_DIR
 CONTRIBUTORS_FILE=${CONTRIBUTORS_FILE=$CUR_DIR/StorageSystemContributors.generated.cpp}
 
 # if you don't specify HEAD here, without terminal `git shortlog` would expect input from stdin
-git shortlog HEAD --summary | perl -lnE 's/^\s+\d+\s+(.+)/    "$1",/; next unless $1; say $_' | sort > $CONTRIBUTORS_FILE.tmp
+git shortlog HEAD --summary | perl -lnE 's/^\s+\d+\s+(.+)/    "$1",/; next unless $1; say $_' | LC_ALL=C sort > $CONTRIBUTORS_FILE.tmp
 
 # If git history not available - dont make target file
 if [ ! -s $CONTRIBUTORS_FILE.tmp ]; then