mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Recognize new 'make check GNUSTEP_TEST_OBJCXX=yes' option to enable running ObjC++ testcases. This implicitly clarifies/fixes finding the ObjC++ compiler for the ObjC++ testscases
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32815 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
b03ac4ca6c
commit
cd36bb5890
2 changed files with 30 additions and 6 deletions
|
@ -1,3 +1,10 @@
|
|||
2011-04-09 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Use 'make check GNUSTEP_TEST_OBJCXX=yes' to enable ObjC++
|
||||
testcases when using the test framework.
|
||||
* TestFramework/gnustep-tests.in: Recognize GNUSTEP_TEST_OBJCXX,
|
||||
and reworked choosing the ObjC++ compiler accordingly.
|
||||
|
||||
2011-04-08 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac: Set OBJCXX to ${CXX}, not to the literal CXX.
|
||||
|
|
|
@ -126,15 +126,32 @@ then
|
|||
export CC
|
||||
fi
|
||||
|
||||
# We only suport C++ and ObjC++ code if ObjC++ is available ... so having
|
||||
# a C++ compiler is not sufficient, it has to support ObjC++ too.
|
||||
if test x"$OBJCXX" = x
|
||||
# The C++/ObjC++ tests are currently enabled only if you do 'make
|
||||
# check GNUSTEP_TEST_OBJCXX=yes'.
|
||||
if test x"$GNUSTEP_TEST_OBJCXX" = x"yes"
|
||||
then
|
||||
CXX=`gnustep-config --variable=OBJCXX`
|
||||
# Determine the ObjC++ compiler to use. Either it was supplied
|
||||
# in the environment or command-line by setting the variable
|
||||
# OBJCXX, or we'll use the default configured in gnustep-make.
|
||||
if test x"$OBJCXX" = x
|
||||
then
|
||||
OBJCXX=`gnustep-config --variable=OBJCXX`
|
||||
fi
|
||||
|
||||
if test x"$OBJCXX" = x
|
||||
then
|
||||
echo "Warning: You asked to run the Objective-C++ testcases, but no Objective-C++ compiler was found."
|
||||
echo " Objective-C++ testcases will not be ignored."
|
||||
echo " Try setting OBJCXX to your Objective-C++ compiler to fix this."
|
||||
else
|
||||
# Set the CXX variable which is the one actually used by gnustep-make
|
||||
# to compile and link ObjC++.
|
||||
CXX="$OBJCXX"
|
||||
export CXX
|
||||
fi
|
||||
else
|
||||
CXX=
|
||||
OBJCXX=
|
||||
fi
|
||||
export CXX
|
||||
|
||||
GSTESTFLAGS=
|
||||
if test "$GSTESTMODE" = "failfast"
|
||||
|
|
Loading…
Reference in a new issue