jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct disabling of c++11 testing

Browse source 
C++11 testing was not being turned off when the
C++ compiler check for C++11 features failed and
'configure --enable-cpp11-testing' was used
This commit is contained in:
William S Fulton 2021-04-26 19:19:59 +01:00
commit f14c712001
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/common.mk
View file

@ -677,7 +677,7 @@ ifndef SKIP_CPP_STD_CASES
CPP_TEST_CASES += ${CPP_STD_TEST_CASES} CPP_TEST_CASES += ${CPP_STD_TEST_CASES}
endif endif
ifneq (,$(HAVE_CXX11)) ifeq (1,$(HAVE_CXX11))
CPP_TEST_CASES += $(CPP11_TEST_CASES) CPP_TEST_CASES += $(CPP11_TEST_CASES)
endif endif

2
configure.ac
View file

@ -345,6 +345,7 @@ if test x"$enable_cpp11_testing" = xyes; then
CXX=$CXX_SAVED CXX=$CXX_SAVED
CXXCPP=$CXXCPP_SAVED CXXCPP=$CXXCPP_SAVED
fi fi
AC_SUBST(HAVE_CXX11)
# On darwin 10.7,10.8,10.9 using clang++, need to ensure using # On darwin 10.7,10.8,10.9 using clang++, need to ensure using
# libc++ for tests and examples to run under mono. May affect # libc++ for tests and examples to run under mono. May affect
@ -401,7 +402,6 @@ AC_SUBST(TRYLINKINGWITHCXX)
AC_SUBST(RPATH) AC_SUBST(RPATH)
AC_SUBST(PLATCFLAGS) AC_SUBST(PLATCFLAGS)
AC_SUBST(PLATCXXFLAGS) AC_SUBST(PLATCXXFLAGS)
AC_SUBST(HAVE_CXX11)
AC_SUBST(LINKFORSHARED) AC_SUBST(LINKFORSHARED)
# This variation is needed on OS-X because there is no (apparent) consistency in shared library naming. # This variation is needed on OS-X because there is no (apparent) consistency in shared library naming.