diff options
author | Torsten Keßler | 2020-07-12 04:56:52 +0200 |
---|---|---|
committer | GitHub | 2020-07-11 22:56:52 -0400 |
commit | 82f5bef07588aae827c053fc632c33a92647299e (patch) | |
tree | d31338e51bc73beef6e57d0bc1086fc7bdf65faf /remove_gcc_logic.patch | |
parent | b665f0620c7c16772ee5a28ef7b6857753f64759 (diff) | |
download | aur-82f5bef07588aae827c053fc632c33a92647299e.tar.gz |
[aomp-amdgpu] Successful build in clean chroot (#295)
Diffstat (limited to 'remove_gcc_logic.patch')
-rw-r--r-- | remove_gcc_logic.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/remove_gcc_logic.patch b/remove_gcc_logic.patch new file mode 100644 index 000000000000..e8da183b0fbf --- /dev/null +++ b/remove_gcc_logic.patch @@ -0,0 +1,47 @@ +*** aomp/bin/build_openmp.sh.bak 2020-07-11 16:55:42.995876206 +0200 +--- aomp/bin/build_openmp.sh 2020-07-11 16:56:14.952367513 +0200 +*************** +*** 73,106 **** + $SUDO rm $INSTALL_OPENMP/testfile + fi + +! GCCMIN=7 +! if [ "$AOMP_BUILD_CUDA" == 1 ] ; then +! if [ -f $CUDABIN/nvcc ] ; then +! CUDAVER=`$CUDABIN/nvcc --version | grep compilation | cut -d" " -f5 | cut -d"." -f1 ` +! echo "CUDA VERSION IS $CUDAVER" +! if [ $CUDAVER -gt 8 ] ; then +! GCCMIN=7 +! fi +! fi +! fi +! +! function getgcc7orless(){ +! _loc=`which gcc` +! [ "$_loc" == "" ] && return +! gccver=`$_loc --version | grep gcc | cut -d")" -f2 | cut -d"." -f1` +! [ $gccver -gt $GCCMIN ] && _loc=`which gcc-$GCCMIN` +! echo $_loc +! } +! function getgxx7orless(){ +! _loc=`which g++` +! [ "$_loc" == "" ] && return +! gxxver=`$_loc --version | grep g++ | cut -d")" -f2 | cut -d"." -f1` +! [ $gxxver -gt $GCCMIN ] && _loc=`which g++-$GCCMIN` +! echo $_loc +! } +! +! GCCLOC=$(getgcc7orless) +! GXXLOC=$(getgxx7orless) + if [ "$GCCLOC" == "" ] ; then + echo "ERROR: NO ADEQUATE gcc" + echo " Please install gcc-5 or gcc-7" +--- 73,80 ---- + $SUDO rm $INSTALL_OPENMP/testfile + fi + +! GCCLOC=/usr/bin/gcc +! GXXLOC=/usr/bin/g++ + if [ "$GCCLOC" == "" ] ; then + echo "ERROR: NO ADEQUATE gcc" + echo " Please install gcc-5 or gcc-7" |