From 3b8eff5552e65b2d673435a0bc4d088de9996268 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 7 Nov 2001 15:57:17 -0500 Subject: [PATCH] remove template flags from cmake, no ptused, or -instance=static --- Source/cmUnixMakefileGenerator.cxx | 2 +- Templates/configure | 27 +++++------------------- Templates/configure.in | 16 --------------- configure | 33 ++++-------------------------- configure.in | 24 ---------------------- 5 files changed, 10 insertions(+), 92 deletions(-) diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 7954a5870..49d92a0b7 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -1112,7 +1112,7 @@ void cmUnixMakefileGenerator::OutputMakeVariables(std::ostream& fout) "CMAKE_SHLIB_CFLAGS = @CMAKE_SHLIB_CFLAGS@\n" "\n" "CMAKE_CXX_COMPILER = @CMAKE_CXX_COMPILER@\n" - "CMAKE_CXXFLAGS = @CMAKE_CXX_FLAGS@ @CMAKE_TEMPLATE_FLAGS@\n" + "CMAKE_CXXFLAGS = @CMAKE_CXX_FLAGS@\n" "\n" "CMAKE_SHLIB_BUILD_FLAGS = @CMAKE_SHLIB_BUILD_FLAGS@\n" "CMAKE_SHLIB_LINK_FLAGS = @CMAKE_SHLIB_LINK_FLAGS@\n" diff --git a/Templates/configure b/Templates/configure index 6c15a69df..fe44f7a7c 100755 --- a/Templates/configure +++ b/Templates/configure @@ -3005,28 +3005,12 @@ fi -# if we are not running g++ then we might need some other flags -# to get the templates compiled correctly -CMAKE_TEMPLATE_FLAGS="" -if test $ac_cv_prog_gxx = no; then - echo $ac_n "checking whether ${CXX} accepts -ptused -no_prelink""... $ac_c" 1>&6 - echo 'void f(){}' > conftest.cc - if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then - echo "$ac_t""yes" 1>&6 - CMAKE_TEMPLATE_FLAGS="-ptused -no_prelink" - else - echo "$ac_t""no" 1>&6 - fi - rm -f conftest* -fi - - # check no g++ compilers to see if they have the standard # ansi stream files (without the .h) if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6 -echo "configure:3030: checking ansi standard C++ stream headers " >&5 +echo "configure:3014: checking ansi standard C++ stream headers " >&5 rm -rf conftest.* cat > conftest.cc < @@ -3043,7 +3027,7 @@ fi # check to see if stl is in the std namespace if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6 -echo "configure:3047: checking ansi standard namespace support " >&5 +echo "configure:3031: checking ansi standard namespace support " >&5 rm -rf conftest.* cat > conftest.cc < @@ -3061,7 +3045,7 @@ fi # check to see if for scoping is supported if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6 -echo "configure:3065: checking ansi for scope support " >&5 +echo "configure:3049: checking ansi for scope support " >&5 rm -rf conftest.* cat > conftest.cc <&6 -echo "configure:3090: checking for $ac_word" >&5 +echo "configure:3074: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RUNMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3126,7 +3110,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3130: checking for $ac_word" >&5 +echo "configure:3114: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CMAKE_AR_TMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3367,7 +3351,6 @@ s%@CMAKE_HP_PTHREADS@%$CMAKE_HP_PTHREADS%g s%@CMAKE_THREAD_LIBS@%$CMAKE_THREAD_LIBS%g s%@CMAKE_ANSI_CFLAGS@%$CMAKE_ANSI_CFLAGS%g s%@CMAKE_ANSI_CXXFLAGS@%$CMAKE_ANSI_CXXFLAGS%g -s%@CMAKE_TEMPLATE_FLAGS@%$CMAKE_TEMPLATE_FLAGS%g s%@CMAKE_NO_ANSI_STREAM_HEADERS@%$CMAKE_NO_ANSI_STREAM_HEADERS%g s%@CMAKE_NO_STD_NAMESPACE@%$CMAKE_NO_STD_NAMESPACE%g s%@CMAKE_NO_ANSI_FOR_SCOPE@%$CMAKE_NO_ANSI_FOR_SCOPE%g diff --git a/Templates/configure.in b/Templates/configure.in index c74091bac..62f2a5142 100644 --- a/Templates/configure.in +++ b/Templates/configure.in @@ -582,22 +582,6 @@ fi AC_SUBST(CMAKE_ANSI_CFLAGS) AC_SUBST(CMAKE_ANSI_CXXFLAGS) -# if we are not running g++ then we might need some other flags -# to get the templates compiled correctly -CMAKE_TEMPLATE_FLAGS="" -if test $ac_cv_prog_gxx = no; then - echo $ac_n "checking whether ${CXX} accepts -ptused -no_prelink""... $ac_c" 1>&6 - echo 'void f(){}' > conftest.cc - if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then - echo "$ac_t""yes" 1>&6 - CMAKE_TEMPLATE_FLAGS="-ptused -no_prelink" - else - echo "$ac_t""no" 1>&6 - fi - rm -f conftest* -fi -AC_SUBST(CMAKE_TEMPLATE_FLAGS) - # check no g++ compilers to see if they have the standard # ansi stream files (without the .h) diff --git a/configure b/configure index 2f9934688..70e1aec48 100755 --- a/configure +++ b/configure @@ -957,35 +957,11 @@ fi -# if we are not running g++ then we might need some other flags -# to get the templates compiled correctly -CMAKE_TEMPLATE_FLAGS="" -if test $ac_cv_prog_gxx = no; then - echo $ac_n "checking whether ${CXX} accepts -ptused -no_prelink""... $ac_c" 1>&6 - echo 'void f(){}' > conftest.cc - if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then - echo "$ac_t""yes" 1>&6 - CMAKE_TEMPLATE_FLAGS="-ptused -no_prelink" - else - echo "$ac_t""no" 1>&6 - fi - rm -f conftest* - echo $ac_n "checking whether ${CXX} accepts -instances=semiexplicit""... $ac_c" 1>&6 - echo 'void f(){}' > conftest.cc - if test -z "`${CXX} -instances=static -c conftest.cc 2>&1`"; then - echo "$ac_t""yes" 1>&6 - CMAKE_TEMPLATE_FLAGS="-instances=static" - else - echo "$ac_t""no" 1>&6 - fi -fi - - # check no g++ compilers to see if they have the standard # ansi stream files (without the .h) if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6 -echo "configure:989: checking ansi standard C++ stream headers " >&5 +echo "configure:965: checking ansi standard C++ stream headers " >&5 rm -rf conftest.* cat > conftest.cc < @@ -1004,7 +980,7 @@ fi # check to see if stl is in the std namespace if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6 -echo "configure:1008: checking ansi standard namespace support " >&5 +echo "configure:984: checking ansi standard namespace support " >&5 rm -rf conftest.* cat > conftest.cc < @@ -1024,7 +1000,7 @@ fi # check to see if for scoping is supported if test $ac_cv_prog_gxx = no; then echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6 -echo "configure:1028: checking ansi for scope support " >&5 +echo "configure:1004: checking ansi for scope support " >&5 rm -rf conftest.* cat > conftest.cc <&6 -echo "configure:1050: checking for $ac_word" >&5 +echo "configure:1026: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RUNMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1220,7 +1196,6 @@ s%@CXX@%$CXX%g s%@CMAKE_ROOT_DIR@%$CMAKE_ROOT_DIR%g s%@CMAKE_ANSI_CFLAGS@%$CMAKE_ANSI_CFLAGS%g s%@CMAKE_ANSI_CXXFLAGS@%$CMAKE_ANSI_CXXFLAGS%g -s%@CMAKE_TEMPLATE_FLAGS@%$CMAKE_TEMPLATE_FLAGS%g s%@RUNMAKE@%$RUNMAKE%g CEOF diff --git a/configure.in b/configure.in index bea1f969e..1c67a4fec 100644 --- a/configure.in +++ b/configure.in @@ -72,30 +72,6 @@ fi AC_SUBST(CMAKE_ANSI_CFLAGS) AC_SUBST(CMAKE_ANSI_CXXFLAGS) -# if we are not running g++ then we might need some other flags -# to get the templates compiled correctly -CMAKE_TEMPLATE_FLAGS="" -if test $ac_cv_prog_gxx = no; then - echo $ac_n "checking whether ${CXX} accepts -ptused -no_prelink""... $ac_c" 1>&6 - echo 'void f(){}' > conftest.cc - if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then - echo "$ac_t""yes" 1>&6 - CMAKE_TEMPLATE_FLAGS="-ptused -no_prelink" - else - echo "$ac_t""no" 1>&6 - fi - rm -f conftest* - echo $ac_n "checking whether ${CXX} accepts -instances=semiexplicit""... $ac_c" 1>&6 - echo 'void f(){}' > conftest.cc - if test -z "`${CXX} -instances=static -c conftest.cc 2>&1`"; then - echo "$ac_t""yes" 1>&6 - CMAKE_TEMPLATE_FLAGS="-instances=static" - else - echo "$ac_t""no" 1>&6 - fi -fi -AC_SUBST(CMAKE_TEMPLATE_FLAGS) - # check no g++ compilers to see if they have the standard # ansi stream files (without the .h) if test $ac_cv_prog_gxx = no; then