Skip to content

Commit fb33ad4

Browse files
committed
Simplify build_tensorflow.sh.in script
1 parent 54b58a3 commit fb33ad4

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

Dockerfiles/install-archlinux.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ done
1515
# install requirements
1616
pacman -Syu --noconfirm --needed \
1717
base-devel \
18+
gcc11 \
1819
cmake \
1920
git \
2021
python \

tensorflow_cc/cmake/build_tensorflow.sh.in

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,27 +64,20 @@ if [ "$cuda_allowed" == true ] && [ "$cuda_available" == true ]; then
6464
export TF_CUDNN_VERSION="$(find /opt /usr -name 'libcudnn.so.*' -path '*/cuda*' | tail -n1 | sed -r 's/^.*\.so\.//')"
6565

6666
# choose the right version of CUDA compiler
67-
if [ -z "$CC" ] || [ -z $GCC ]; then
67+
if [ -z "${GCC_HOST_COMPILER_PATH}" ]; then
6868
if hash gcc-11 2>/dev/null && version_gt 11.4 `gcc-11 -dumpversion`; then
69-
export CC=${CC:-"gcc-11"}
70-
export CXX=${CXX:-"g++-11"}
69+
export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-`which gcc-11`}
7170
elif hash gcc-10 2>/dev/null && version_gt 10.3 `gcc-10 -dumpversion`; then
72-
export CC=${CC:-"gcc-10"}
73-
export CXX=${CXX:-"g++-10"}
71+
export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-`which gcc-10`}
7472
elif hash gcc-9 2>/dev/null && version_gt 9.4 `gcc-9 -dumpversion`; then
75-
export CC=${CC:-"gcc-9"}
76-
export CXX=${CXX:-"g++-9"}
73+
export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-`which gcc-9`}
7774
elif hash gcc-8 2>/dev/null && version_gt 8.5 `gcc-8 -dumpversion`; then
78-
export CC=${CC:-"gcc-8"}
79-
export CXX=${CXX:-"g++-8"}
75+
export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-`which gcc-8`}
8076
else
81-
export CC=${CC:-"gcc"}
82-
export CXX=${CXX:-"g++"}
77+
export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-`which gcc`}
8378
fi
8479
fi
85-
export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-`which $CC`}
86-
export HOST_C_COMPILER=${HOST_C_COMPILER:-`which $CC`}
87-
export HOST_CXX_COMPILER=${HOST_CXX_COMPILER:-`which $CXX`}
80+
8881
export CLANG_CUDA_COMPILER_PATH=${CLANG_CUDA_COMPILER_PATH:-"/usr/bin/clang"}
8982
export TF_CUDA_CLANG=${TF_CUDA_CLANG:-0}
9083
else

0 commit comments

Comments
 (0)