bdb8d8a27d
CC.rc was the only "mandatory" detection, which was weird and inconsistent. Instead, make it optional like the others, and have it set a HAVE_CC variable appropriately (and have CXX.rc work the same way). Then, add a default.required.rc.od that checks the HAVE_* for any variable and aborts if it is not available. This allows us to fix confusing behaviour in allconfig.do, which would try every compiler on the system, but redo would print a (non-fatal) error message (and prevent redo-stamp optimization) when CC.rc failed for any non-working compilers. Now CC.rc just politely reports that it didn't find a compiler. Then we change all.rc.od to make CC.rc mandatory. Reported-by: Nathaniel Filardo <nwfilardo@gmail.com>
35 lines
854 B
Text
35 lines
854 B
Text
. ./redoconf.rc
|
|
rc_include rc/CC.rc
|
|
|
|
rc_helpmsg CXX "C++ compiler name (c++)"
|
|
rc_helpmsg CXXFLAGS "Extra C++ compiler flags (eg. -O2 -g)"
|
|
|
|
if [ -n "$CXX" ]; then
|
|
set -- "$CXX"
|
|
else
|
|
# Note: $ARCH has already been set correctly by CC.rc
|
|
set -- \
|
|
"${ARCH}c++" "${ARCH}g++" \
|
|
"${ARCH}clang++" "/usr/bin/${ARCH}clang++"-[0-9]*
|
|
fi
|
|
|
|
for d in "$@"; do
|
|
[ -n "$d" ] || continue
|
|
echo "Trying C++ compiler: '$d'" >&2
|
|
if CC="" CXX="$d" LINK="$d" rc_compile cxx link 'class A {};'; then
|
|
rc_replaceln CXX "$d"
|
|
# If the project activates CXX.rc, then we
|
|
# replace the C linker with C++. This causes
|
|
# it to include -lstdc++, etc.
|
|
# A future .rc could override this again.
|
|
rc_replaceln LINK "$d"
|
|
rc_replaceln HAVE_CXX 1
|
|
rc_save
|
|
exit 0
|
|
fi
|
|
done
|
|
|
|
echo "Warning: Can't find a working C++ compiler." >&2
|
|
rc_undo
|
|
rc_replaceln CXX ""
|
|
rc_save
|