Skip to content

GitLab

Commit b5cff36f authored by Bill Hoffman's avatar Bill Hoffman
Browse files
Options

BUG: fix for OSF compiler to use ansi mode for streams

parent 04013032
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 14 deletions
Templates/cxxconfigure
View file @ b5cff36f
...@@ -738,7 +738,18 @@ case $system in ...@@ -738,7 +738,18 @@ case $system in
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
rm -f conftest* rm -f conftest*
;; ;;
OSF1-*)
echo $ac_n "checking whether ${CXX} accepts -std strict_ansi""... $ac_c" 1>&6
echo 'void f(){}' > conftest.c
if test -z "`${CXX} -std strict_ansi -c conftest.c 2>&1`"; then
echo "$ac_t""yes" 1>&6
CMAKE_ANSI_CXXFLAGS="-std strict_ansi"
else
echo "$ac_t""no" 1>&6
fi
rm -f conftest*
;;
esac esac
fi fi
...@@ -764,7 +775,7 @@ fi ...@@ -764,7 +775,7 @@ fi
# ansi stream files (without the .h) # ansi stream files (without the .h)
if test $ac_cv_prog_gxx = no; then if test $ac_cv_prog_gxx = no; then
echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6 echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6
echo "configure:768: checking ansi standard C++ stream headers " >&5 echo "configure:779: checking ansi standard C++ stream headers " >&5
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
#include <iostream> #include <iostream>
...@@ -780,7 +791,7 @@ fi ...@@ -780,7 +791,7 @@ fi
# check compilers to see if they have std::stringstream # check compilers to see if they have std::stringstream
echo $ac_n "checking for ansi standard C++ stringstream ""... $ac_c" 1>&6 echo $ac_n "checking for ansi standard C++ stringstream ""... $ac_c" 1>&6
echo "configure:784: checking for ansi standard C++ stringstream " >&5 echo "configure:795: checking for ansi standard C++ stringstream " >&5
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
#include <sstream> #include <sstream>
...@@ -796,7 +807,7 @@ fi ...@@ -796,7 +807,7 @@ fi
# check to see if stl is in the std namespace # check to see if stl is in the std namespace
if test $ac_cv_prog_gxx = no; then if test $ac_cv_prog_gxx = no; then
echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6 echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6
echo "configure:800: checking ansi standard namespace support " >&5 echo "configure:811: checking ansi standard namespace support " >&5
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
#include <list> #include <list>
...@@ -814,7 +825,7 @@ fi ...@@ -814,7 +825,7 @@ fi
# check to see if for scoping is supported # check to see if for scoping is supported
if test $ac_cv_prog_gxx = no; then if test $ac_cv_prog_gxx = no; then
echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6 echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6
echo "configure:818: checking ansi for scope support " >&5 echo "configure:829: checking ansi for scope support " >&5
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
void foo() { for(int i;;); for(int i;;); } void foo() { for(int i;;); for(int i;;); }
...@@ -835,7 +846,7 @@ do ...@@ -835,7 +846,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:839: checking for $ac_word" >&5 echo "configure:850: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CMAKE_AR_TMP'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_CMAKE_AR_TMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
......
Templates/cxxconfigure.in
View file @ b5cff36f
...@@ -74,7 +74,18 @@ case $system in ...@@ -74,7 +74,18 @@ case $system in
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
rm -f conftest* rm -f conftest*
;; ;;
OSF1-*)
echo $ac_n "checking whether ${CXX} accepts -std strict_ansi""... $ac_c" 1>&6
echo 'void f(){}' > conftest.c
if test -z "`${CXX} -std strict_ansi -c conftest.c 2>&1`"; then
echo "$ac_t""yes" 1>&6
CMAKE_ANSI_CXXFLAGS="-std strict_ansi"
else
echo "$ac_t""no" 1>&6
fi
rm -f conftest*
;;
esac esac
fi fi
AC_SUBST(CMAKE_ANSI_CXXFLAGS) AC_SUBST(CMAKE_ANSI_CXXFLAGS)
......
configure
View file @ b5cff36f
...@@ -972,7 +972,19 @@ case $system in ...@@ -972,7 +972,19 @@ case $system in
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
rm -f conftest* rm -f conftest*
;; ;;
OSF1-*)
echo $ac_n "checking whether ${CXX} accepts -std strict_ansi""... $ac_c" 1>&6
echo 'void f(){}' > conftest.c
if test -z "`${CXX} -std strict_ansi -c conftest.c 2>&1`"; then
echo "$ac_t""yes" 1>&6
CMAKE_ANSI_CXXFLAGS="-std strict_ansi"
else
echo "$ac_t""no" 1>&6
fi
rm -f conftest*
;;
esac esac
fi fi
...@@ -982,7 +994,7 @@ fi ...@@ -982,7 +994,7 @@ fi
# ansi stream files (without the .h) # ansi stream files (without the .h)
if test $ac_cv_prog_gxx = no; then if test $ac_cv_prog_gxx = no; then
echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6 echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6
echo "configure:986: checking ansi standard C++ stream headers " >&5 echo "configure:998: checking ansi standard C++ stream headers " >&5
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
#include <iostream> #include <iostream>
...@@ -1000,7 +1012,7 @@ fi ...@@ -1000,7 +1012,7 @@ fi
# check non-g++ compilers to see if they have std::stringstream # check non-g++ compilers to see if they have std::stringstream
echo $ac_n "checking for ansi standard C++ stringstream ""... $ac_c" 1>&6 echo $ac_n "checking for ansi standard C++ stringstream ""... $ac_c" 1>&6
echo "configure:1004: checking for ansi standard C++ stringstream " >&5 echo "configure:1016: checking for ansi standard C++ stringstream " >&5
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
#include <sstream> #include <sstream>
...@@ -1018,7 +1030,7 @@ fi ...@@ -1018,7 +1030,7 @@ fi
# check to see if stl is in the std namespace # check to see if stl is in the std namespace
if test $ac_cv_prog_gxx = no; then if test $ac_cv_prog_gxx = no; then
echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6 echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6
echo "configure:1022: checking ansi standard namespace support " >&5 echo "configure:1034: checking ansi standard namespace support " >&5
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
#include <list> #include <list>
...@@ -1038,7 +1050,7 @@ fi ...@@ -1038,7 +1050,7 @@ fi
# check to see if for scoping is supported # check to see if for scoping is supported
if test $ac_cv_prog_gxx = no; then if test $ac_cv_prog_gxx = no; then
echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6 echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6
echo "configure:1042: checking ansi for scope support " >&5 echo "configure:1054: checking ansi for scope support " >&5
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
void foo() { for(int i;;); for(int i;;); } void foo() { for(int i;;); for(int i;;); }
...@@ -1060,7 +1072,7 @@ do ...@@ -1060,7 +1072,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1064: checking for $ac_word" >&5 echo "configure:1076: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RUNMAKE'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_RUNMAKE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
......
configure.in
View file @ b5cff36f
...@@ -87,7 +87,19 @@ case $system in ...@@ -87,7 +87,19 @@ case $system in
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
rm -f conftest* rm -f conftest*
;; ;;
OSF1-*)
echo $ac_n "checking whether ${CXX} accepts -std strict_ansi""... $ac_c" 1>&6
echo 'void f(){}' > conftest.c
if test -z "`${CXX} -std strict_ansi -c conftest.c 2>&1`"; then
echo "$ac_t""yes" 1>&6
CMAKE_ANSI_CXXFLAGS="-std strict_ansi"
else
echo "$ac_t""no" 1>&6
fi
rm -f conftest*
;;
esac esac
fi fi
AC_SUBST(CMAKE_ANSI_CFLAGS) AC_SUBST(CMAKE_ANSI_CFLAGS)
......
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