From: hartmann Date: Mon, 8 Mar 2004 12:24:49 +0000 (+0000) Subject: MIPSPro compiler doesn't define __sgi__. Therefore add __sgi__ to compile flags.... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70a9af0ea5148a8a4d3abb5e7518352f5cc10f0a;p=dealii-svn.git MIPSPro compiler doesn't define __sgi__. Therefore add __sgi__ to compile flags. MIPSPro compiler 7.4x, x>=1 is supported but 7.4 is not supported. git-svn-id: https://svn.dealii.org/trunk@8671 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 6af2bd792c..0bc788bba3 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -111,17 +111,22 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl mips_pro="`($CXX -version 2>&1) | grep MIPSpro`" if test "x$mips_pro" != "x" ; then case "$mips_pro" in - *"7.0"* | *"7.1"* | *"7.2"* | *"7.3"*) + *7.0* | *7.1* | *7.2* | *7.3*) dnl MIPSpro 7.3 does not support standard C++, therefore it is not dnl able to compile deal.II. Previous compiler versions neither. AC_MSG_RESULT(C++ compiler is $mips_pro) AC_MSG_ERROR(This compiler is not supported) GXX_VERSION=MIPSpro7.3 ;; - *"7.4"*) + *7.4) AC_MSG_RESULT(C++ compiler is MIPSpro compiler 7.4) + AC_MSG_ERROR(This compiler is not supported. Use MIPSPro compiler 7.4x) GXX_VERSION=MIPSpro7.4 ;; + *7.41* | *7.42* | *7.43* | *7.44*) + AC_MSG_RESULT(C++ compiler is MIPSpro compiler 7.4x) + GXX_VERSION=MIPSpro7.4x + ;; *"7.5"*) AC_MSG_RESULT(C++ compiler is MIPSpro compiler 7.5) GXX_VERSION=MIPSpro7.5 @@ -412,14 +417,14 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl dnl The indicated enumeration value is out of "int" range. dnl cc-1485 CC: WARNING File = /usr/include/CC/iomanip, Line = 122 dnl This form for taking the address of a member function is nonstandard. - CXXFLAGSG="$CXXFLAGS -DDEBUG -no_auto_include -ansiW -woff 1429,1066,1485" + CXXFLAGSG="$CXXFLAGS -DDEBUG -D__sgi__ -no_auto_include -ansiW -woff 1429,1066,1485" dnl Disable some compiler warnings, that warn about variables dnl which are used in Assert templates but not in optimized mode dnl cc-1174 CC: full_matrix.templates.h, Line = 1461 dnl The variable "typical_diagonal_element" was declared but never referenced. dnl cc-1552 CC: WARNING File = source/data_out_base.cc, Line = 3493 dnl The variable "ierr" is set but never used. - CXXFLAGSO="$CXXFLAGS -O2 -no_auto_include -woff 1174,1552" + CXXFLAGSO="$CXXFLAGS -D__sgi__ -O2 -no_auto_include -woff 1174,1552" CXXFLAGSPIC="-KPIC" LDFLAGSPIC="-KPIC" dnl Avoid output of prelinker diff --git a/deal.II/configure b/deal.II/configure index 76b98444d1..d4bcb278cf 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision. +# From configure.in Revision: 1.162 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -2767,7 +2767,7 @@ echo "${ECHO_T}C++ compiler is IBM xlC" >&6 mips_pro="`($CXX -version 2>&1) | grep MIPSpro`" if test "x$mips_pro" != "x" ; then case "$mips_pro" in - *"7.0"* | *"7.1"* | *"7.2"* | *"7.3"*) + *7.0* | *7.1* | *7.2* | *7.3*) echo "$as_me:$LINENO: result: C++ compiler is $mips_pro" >&5 echo "${ECHO_T}C++ compiler is $mips_pro" >&6 { { echo "$as_me:$LINENO: error: This compiler is not supported" >&5 @@ -2775,11 +2775,19 @@ echo "$as_me: error: This compiler is not supported" >&2;} { (exit 1); exit 1; }; } GXX_VERSION=MIPSpro7.3 ;; - *"7.4"*) + *7.4) echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4" >&5 echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.4" >&6 + { { echo "$as_me:$LINENO: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&5 +echo "$as_me: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&2;} + { (exit 1); exit 1; }; } GXX_VERSION=MIPSpro7.4 ;; + *7.41* | *7.42* | *7.43* | *7.44*) + echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4x" >&5 +echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.4x" >&6 + GXX_VERSION=MIPSpro7.4x + ;; *"7.5"*) echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.5" >&5 echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.5" >&6 @@ -3092,8 +3100,8 @@ rm -f conftest.$ac_objext conftest.$ac_ext ;; MIPSpro*) - CXXFLAGSG="$CXXFLAGS -DDEBUG -no_auto_include -ansiW -woff 1429,1066,1485" - CXXFLAGSO="$CXXFLAGS -O2 -no_auto_include -woff 1174,1552" + CXXFLAGSG="$CXXFLAGS -DDEBUG -D__sgi__ -no_auto_include -ansiW -woff 1429,1066,1485" + CXXFLAGSO="$CXXFLAGS -D__sgi__ -O2 -no_auto_include -woff 1174,1552" CXXFLAGSPIC="-KPIC" LDFLAGSPIC="-KPIC" LDFLAGS="$LDFLAGS -quiet_prelink"