Merge pull request #172 from FloopCZ/arch-gcc

Arch gcc

Author: FloopCZ

Dockerfiles/install-archlinux.sh

@@ -30,7 +30,7 @@ pacman -Syu --noconfirm --needed \
 
 if $shared; then
     pacman -S --noconfirm --needed \
-      gcc7 \
+      gcc \
       java-environment=8 \
       libarchive \
       protobuf \

tensorflow_cc/cmake/TensorflowShared.cmake

@@ -11,8 +11,8 @@ ExternalProject_Add(
   DOWNLOAD_COMMAND ""
   UPDATE_COMMAND ""
   CONFIGURE_COMMAND tensorflow/contrib/makefile/compile_linux_protobuf.sh
-            # patch nsync to use g++-7
-            COMMAND sed -i "s/ g++/ g++-7/g" tensorflow/contrib/makefile/compile_nsync.sh
+            # Do not fail on warnings when building nsync
+            COMMAND sed -i "s/ -Werror//g" tensorflow/contrib/makefile/compile_nsync.sh
             COMMAND tensorflow/contrib/makefile/compile_nsync.sh
             COMMAND "${CMAKE_CURRENT_BINARY_DIR}/build_tensorflow.sh"
             COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/cmake/copy_links.sh" .

tensorflow_cc/cmake/build_tensorflow.sh.in

@@ -68,7 +68,9 @@ if [ "@ALLOW_CUDA@" = "ON" ] && [ -n "${CUDA_TOOLKIT_PATH}" ]; then
 
     # choose the right version of CUDA compiler
     if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
-        if   hash gcc-7 2>/dev/null && version_gt 7.5 `gcc-7 -dumpversion`; then
+        if   hash gcc 2>/dev/null && version_gt 8.5 `gcc -dumpversion`; then
+            export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc"}
+        elif hash gcc-7 2>/dev/null && version_gt 7.5 `gcc-7 -dumpversion`; then
             export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc-7"}
         elif hash gcc-6 2>/dev/null && version_gt 6.4 `gcc-6 -dumpversion`; then
             export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc-6"}