floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attempt to fix GNU fortran detection, fix definition printing

This commit is contained in:
Owen Rafferty 2022-03-28 16:16:14 -05:00
parent 41b6f6bdab
commit 066745db63
No known key found for this signature in database
GPG Key ID: A68B10E2554DEBCB
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
c_check
View File

@ -274,6 +274,8 @@ if [ "$architecture" != "$hostarch" ]; then
fi fi
[ "$os" != "$hostos" ] && cross=1 [ "$os" != "$hostos" ] && cross=1
[ "$os" = "Android" ] && [ "$hostos" = "Linux" ] && [ -n "$TERMUX_APP_PID" ] \
&& cross=0
[ "$USE_OPENMP" != 1 ] && openmp='' [ "$USE_OPENMP" != 1 ] && openmp=''
@ -285,7 +287,7 @@ link="$($compiler_name $flags -c ctest2.c -o ctest2.o 2>&1 && $compiler_name $fl
link="$(echo "$link" | sed 's/\-Y[[:space:]]P\,/\-Y/g')" link="$(echo "$link" | sed 's/\-Y[[:space:]]P\,/\-Y/g')"
flags="$(echo "$link" | tr '[[:space:],\n]' ' ')" flags="$(echo "$link" | tr '[:space:],\n' ' ')"
# Strip trailing quotes # Strip trailing quotes
old_flags="$flags" old_flags="$flags"
@ -362,8 +364,8 @@ compiler="$(echo "$compiler" | tr '[:lower:]' '[:upper:]' )"
[ "$binformat" = "bin32" ] && printf "#define __32BIT__\t1\n" [ "$binformat" = "bin32" ] && printf "#define __32BIT__\t1\n"
[ "$binformat" = "bin64" ] && printf "#define __64BIT__\t1\n" [ "$binformat" = "bin64" ] && printf "#define __64BIT__\t1\n"
[ -n "$need_fu" ] && printf "#define FUNDERSCORE\t%s\n" "$need_fu" [ -n "$need_fu" ] && printf "#define FUNDERSCORE\t%s\n" "$need_fu"
[ "$have_msa" -eq 1 ] && printf "#define HAVE_MSA\t1\n" ! [ "$have_msa" -eq 1 ] || printf "#define HAVE_MSA\t1\n"
[ "$c11_atomics" -eq 1 ] && printf "#define HAVE_C11\t1\n" ! [ "$c11_atomics" -eq 1 ] || printf "#define HAVE_C11\t1\n"
} >> "$config" } >> "$config"

5
f_check
View File

@ -84,13 +84,10 @@ else
;; ;;
*GNU*|*GCC*) *GNU*|*GCC*)
v="${data##*\(GNU\) }" v="${data##*GCC: *\) }"
v="${v%%\"*}" v="${v%%\"*}"
major="${v%%.*}" major="${v%%.*}"
# Uncomment both for checks using minor
#minor="${v#*.}"
#minor="${v%.*}"
if [ "$major" -ge 4 ]; then if [ "$major" -ge 4 ]; then
vendor=GFORTRAN vendor=GFORTRAN