Commit 481083d6 authored by Mikael Ronstrom's avatar Mikael Ronstrom

Made it possible to set CC and CXX on commandline before calling script

for those cases when gcc, cc-5.0, icpc or icc isn't in the path.

Fixed handling of 32 and 64 bits.

Downgraded Solaris builds on Forte to use -xO2 rather than -xO3.

Made it possible to build 64-bits on Mac OS X

Fixed some bugs in setting CC, CXX, ASFLAGS, LDFLAGS

Fixed bugs relating to use of SunStudio/Forte in check-cpu

Reorganized code a bit

Removed the use of --with-fast-mutexes since they aren't really
fast, rather slow.

Added -static-libgcc when using gcc

Added optimising compilation flags on BSD

Added use of curses library on Solaris

Removed the use of MY_ATOMIC_MODE_RWLOCKS which removed use of
atomic instructions

Added support for Forte on Solaris/x86
parent 55f1722c
This diff is collapsed.
...@@ -175,6 +175,7 @@ check_cpu () { ...@@ -175,6 +175,7 @@ check_cpu () {
cc=$CC cc=$CC
fi fi
if test "x$compiler" = "x" ; then
cc_ver=`$cc --version | sed 1q` cc_ver=`$cc --version | sed 1q`
cc_verno=`echo $cc_ver | sed -e 's/^.*(GCC)//g; s/[^0-9. ]//g; s/^ *//g; s/ .*//g'` cc_verno=`echo $cc_ver | sed -e 's/^.*(GCC)//g; s/[^0-9. ]//g; s/^ *//g; s/ .*//g'`
set -- `echo $cc_verno | tr '.' ' '` set -- `echo $cc_verno | tr '.' ' '`
...@@ -214,13 +215,9 @@ check_cpu () { ...@@ -214,13 +215,9 @@ check_cpu () {
return return
;; ;;
esac esac
# now we check whether the compiler really understands the cpu type # now we check whether the compiler really understands the cpu type
touch __test.c touch __test.c
if test "x$core2" = "xyes" ; then
cpu_arg="core2"
fi
while [ "$cpu_arg" ] ; do while [ "$cpu_arg" ] ; do
printf "testing $cpu_arg ... " >&2 printf "testing $cpu_arg ... " >&2
...@@ -236,6 +233,11 @@ check_cpu () { ...@@ -236,6 +233,11 @@ check_cpu () {
break; break;
done done
rm __test.* rm __test.*
fi
if test "x$core2" = "xyes" ; then
cpu_arg="core2"
fi
return 0
} }
check_cpu check_cpu
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment