Skip to content

Commit 4e38d5e

Browse files
committed
Use gcc 8 on arch
1 parent 419eb9d commit 4e38d5e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Dockerfiles/install-archlinux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pacman -Syu --noconfirm --needed \
3030

3131
if $shared; then
3232
pacman -S --noconfirm --needed \
33-
gcc7 \
33+
gcc \
3434
java-environment=8 \
3535
libarchive \
3636
protobuf \

tensorflow_cc/cmake/build_tensorflow.sh.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ if [ "@ALLOW_CUDA@" = "ON" ] && [ -n "${CUDA_TOOLKIT_PATH}" ]; then
6868

6969
# choose the right version of CUDA compiler
7070
if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
71-
if hash gcc-7 2>/dev/null && version_gt 7.5 `gcc-7 -dumpversion`; then
71+
if hash gcc 2>/dev/null && version_gt 8.5 `gcc -dumpversion`; then
72+
export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc"}
73+
elif hash gcc-7 2>/dev/null && version_gt 7.5 `gcc-7 -dumpversion`; then
7274
export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc-7"}
7375
elif hash gcc-6 2>/dev/null && version_gt 6.4 `gcc-6 -dumpversion`; then
7476
export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc-6"}

0 commit comments

Comments
 (0)