--- a/make/toolchain.sh Sun Jan 28 12:39:08 2024 +0100
+++ b/make/toolchain.sh Sun Jan 28 13:10:18 2024 +0100
@@ -3,179 +3,198 @@
# toolchain detection
#
-C_COMPILERS="cc gcc clang suncc"
-CPP_COMPILERS="CC g++ clang++ sunCC"
-unset CC_ARG_CHECKED
-unset TOOLCHAIN_DETECTION_ERROR
+if isplatform "bsd" && notisplatform "openbsd"; then
+ C_COMPILERS="clang gcc cc"
+ CPP_COMPILERS="clang++ g++ CC"
+else
+ C_COMPILERS="gcc clang suncc cc"
+ CPP_COMPILERS="g++ clang++ sunCC CC"
+fi
+unset TOOLCHAIN
unset TOOLCHAIN_NAME
+unset TOOLCHAIN_CC
+unset TOOLCHAIN_CXX
check_c_compiler()
{
- cat > $TEMP_DIR/test.c << __EOF__
+ cat > "$TEMP_DIR/test.c" << __EOF__
/* test file */
#include <stdio.h>
int main(int argc, char **argv) {
-#if defined(__clang__)
- printf("clang\n");
+#if defined(_MSC_VER)
+ printf("msc\n");
+#elif defined(__clang__)
+ printf("clang gnuc\n");
#elif defined(__GNUC__)
- printf("gcc\n");
+ printf("gcc gnuc\n");
#elif defined(__sun)
- printf("suncc\n");
+ printf("suncc\n");
#else
- printf("unknown\n");
+ printf("unknown\n");
#endif
- return 0;
+ return 0;
}
__EOF__
- rm -f $TEMP_DIR/checkcc
- $1 -o $TEMP_DIR/checkcc $CFLAGS $LDFLAGS $TEMP_DIR/test.c 2> /dev/null
-
- if [ $? -ne 0 ]; then
- return 1
- fi
- return 0
+ rm -f "$TEMP_DIR/checkcc"
+ $1 -o "$TEMP_DIR/checkcc" $CFLAGS $LDFLAGS "$TEMP_DIR/test.c" 2> /dev/null
}
check_cpp_compiler()
{
- cat > $TEMP_DIR/test.cpp << __EOF__
+ cat > "$TEMP_DIR/test.cpp" << __EOF__
/* test file */
#include <iostream>
int main(int argc, char **argv) {
-#if defined(__clang__)
- std::cout << "clang" << std::endl;
+#if defined(_MSC_VER)
+ std::cout << "msc" << std::endl;
+#elif defined(__clang__)
+ std::cout << "clang gnuc" << std::endl;
#elif defined(__GNUC__)
- std::cout << "gcc" << std::endl;
+ std::cout << "gcc gnuc" << std::endl;
#elif defined(__sun)
- std::cout << "suncc" << std::endl;
+ std::cout << "suncc" << std::endl;
#else
- std::cout << "unknown" << std::endl;
+ std::cout << "cc" << std::endl;
#endif
- return 0;
+ return 0;
+}
+__EOF__
+ rm -f "$TEMP_DIR/checkcc"
+ $1 -o "$TEMP_DIR/checkcc" $CXXFLAGS $LDFLAGS "$TEMP_DIR/test.cpp" 2> /dev/null
+}
+
+create_libtest_source()
+{
+ # $1: filename
+ # $2: optional include
+ cat > "$TEMP_DIR/$1" << __EOF__
+/* libtest file */
+int main(int argc, char **argv) {
+ return 0;
}
__EOF__
- rm -f $TEMP_DIR/checkcc
- $1 -o $TEMP_DIR/checkcc $CXXFLAGS $LDFLAGS $TEMP_DIR/test.cpp 2> /dev/null
-
- if [ $? -ne 0 ]; then
- return 1
- fi
- return 0
+ if [ -n "$2" ]; then
+ echo "#include <$2>" >> "$TEMP_DIR/$1"
+ fi
+}
+
+check_c_lib()
+{
+ # $1: libname
+ # $2: optional include
+ if [ -z "$TOOLCHAIN_CC" ]; then
+ return 1
+ fi
+ create_libtest_source "test.c" "$2"
+ rm -f "$TEMP_DIR/checklib"
+ $TOOLCHAIN_CC -o "$TEMP_DIR/checklib" $CFLAGS $LDFLAGS "-l$1" "$TEMP_DIR/test.c" 2> /dev/null
+}
+
+check_cpp_lib()
+{
+ # $1: libname
+ # $2: optional include
+ if [ -z "$TOOLCHAIN_CXX" ]; then
+ return 1
+ fi
+ create_libtest_source "test.cpp" "$2"
+ rm -f "$TEMP_DIR/checklib"
+ $TOOLCHAIN_CXX -o "$TEMP_DIR/checklib" $CXXFLAGS $LDFLAGS "-l$1" "$TEMP_DIR/test.cpp" 2> /dev/null
+}
+
+check_lib()
+{
+ # $1: libname
+ # $2: optional include
+ if [ -n "$TOOLCHAIN_CC" ]; then
+ check_c_lib "$1" "$2"
+ elif [ -n "$TOOLCHAIN_CXX" ]; then
+ check_cpp_lib "$1" "$2"
+ fi
}
-printf "detect C compiler... "
+detect_c_compiler()
+{
+ if [ -n "$TOOLCHAIN_CC" ]; then
+ return 0
+ fi
+ printf "detect C compiler... "
+ if [ -n "$CC" ]; then
+ if check_c_compiler "$CC"; then
+ TOOLCHAIN_CC=$CC
+ TOOLCHAIN=`"$TEMP_DIR/checkcc"`
+ TOOLCHAIN_NAME=`echo "$TOOLCHAIN" | cut -f1 -d' ' -`
+ echo "$CC"
+ return 0
+ else
+ echo "$CC is not a working C compiler"
+ return 1
+ fi
+ else
+ for COMP in $C_COMPILERS
+ do
+ if check_c_compiler "$COMP"; then
+ TOOLCHAIN_CC=$COMP
+ TOOLCHAIN=`"$TEMP_DIR/checkcc"`
+ TOOLCHAIN_NAME=`echo "$TOOLCHAIN" | cut -f1 -d' ' -`
+ echo "$COMP"
+ return 0
+ fi
+ done
+ echo "not found"
+ return 1
+ fi
+}
-for COMP in $C_COMPILERS
-do
- check_c_compiler $COMP
- if [ $? -ne 0 ]; then
- if [ ! -z "$CC" ]; then
- if [ $COMP = $CC ]; then
- echo "$CC is not a working C Compiler"
- TOOLCHAIN_DETECTION_ERROR="error"
- break
- fi
- fi
- else
- TOOLCHAIN_NAME=`$TEMP_DIR/checkcc`
- USE_TOOLCHAIN=$TOOLCHAIN_NAME
- if [ $COMP = "cc" ]; then
- # we have found a working compiler, but in case
- # the compiler is gcc or clang, we try to use
- # these commands and not 'cc'
- TOOLCHAIN_NAME=`$TEMP_DIR/checkcc`
- if [ $TOOLCHAIN_NAME = "gcc" ]; then
- check_c_compiler "gcc"
- if [ $? -eq 0 ]; then
- COMP=gcc
- USE_TOOLCHAIN="gcc"
- fi
- fi
- if [ $TOOLCHAIN_NAME = "clang" ]; then
- check_c_compiler "clang"
- if [ $? -eq 0 ]; then
- COMP=clang
- USE_TOOLCHAIN="clang"
- fi
- fi
- fi
-
- TOOLCHAIN_NAME=$USE_TOOLCHAIN
- TOOLCHAIN_CC=$COMP
- echo $COMP
- break
- fi
-done
-if [ -z $TOOLCHAIN_CC ]; then
- echo "not found"
-fi
-
-printf "detect C++ compiler... "
+detect_cpp_compiler()
+{
+ if [ -n "$TOOLCHAIN_CXX" ]; then
+ return 0
+ fi
+ printf "detect C++ compiler... "
-for COMP in $CPP_COMPILERS
-do
- check_cpp_compiler $COMP
- if [ $? -ne 0 ]; then
- if [ ! -z "$CXX" ]; then
- if [ $COMP = $CXX ]; then
- echo "$CC is not a working C++ Compiler"
- TOOLCHAIN_DETECTION_ERROR="error"
- break
- fi
- fi
- else
- if [ $COMP = "CC" ]; then
- # we have found a working compiler, but in case
- # the compiler is gcc or clang, we try to use
- # these commands and not 'cc'
- TOOLCHAIN_NAME=`$TEMP_DIR/checkcc`
- USE_TOOLCHAIN=$TOOLCHAIN_NAME
- if [ $TOOLCHAIN_NAME = "gcc" ]; then
- check_cpp_compiler "g++"
- if [ $? -eq 0 ]; then
- COMP=g++
- USE_TOOLCHAIN="gcc"
- fi
- fi
- if [ $TOOLCHAIN_NAME = "clang" ]; then
- check_cpp_compiler "clang++"
- if [ $? -eq 0 ]; then
- COMP=clang++
- USE_TOOLCHAIN="clang"
- fi
- fi
- fi
-
- TOOLCHAIN_NAME=$USE_TOOLCHAIN
- TOOLCHAIN_CXX=$COMP
- echo $COMP
- break
- fi
-done
-if [ -z $TOOLCHAIN_CXX ]; then
- echo "not found"
-fi
+ if [ -n "$CXX" ]; then
+ if check_cpp_compiler "$CXX"; then
+ TOOLCHAIN_CXX=$CXX
+ TOOLCHAIN=`"$TEMP_DIR/checkcc"`
+ TOOLCHAIN_NAME=`echo "$TOOLCHAIN" | cut -f1 -d' ' -`
+ echo "$CXX"
+ return 0
+ else
+ echo "$CXX is not a working C++ compiler"
+ return 1
+ fi
+ else
+ for COMP in $CPP_COMPILERS
+ do
+ if check_cpp_compiler "$COMP"; then
+ TOOLCHAIN_CXX=$COMP
+ TOOLCHAIN=`"$TEMP_DIR/checkcc"`
+ TOOLCHAIN_NAME=`echo "$TOOLCHAIN" | cut -f1 -d' ' -`
+ echo "$COMP"
+ return 0
+ fi
+ done
+ echo "${TOOLCHAIN_CXX:-"not found"}"
+ return 1
+ fi
+}
-TOOLCHAIN_LD=$TOOLCHAIN_CC
-
-if [ -z "$TOOLCHAIN_NAME" ]; then
- TOOLCHAIN_DETECTION_ERROR="error"
-else
- cat >> $TEMP_DIR/config.mk << __EOF__
-# toolchain
-__EOF__
- echo "CC = ${TOOLCHAIN_CC}" >> $TEMP_DIR/config.mk
- if [ ! -z "$TOOLCHAIN_CXX" ]; then
- echo "CXX = ${TOOLCHAIN_CXX}" >> $TEMP_DIR/config.mk
- fi
- echo "LD = ${TOOLCHAIN_LD}" >> $TEMP_DIR/config.mk
- echo >> $TEMP_DIR/config.mk
-
- cat "make/${TOOLCHAIN_NAME}.mk" > /dev/null 2>&1
- if [ $? -eq 0 ]; then
- echo "include \$(BUILD_ROOT)/make/${TOOLCHAIN_NAME}.mk" >> $TEMP_DIR/config.mk
- else
- echo "SHLIB_CFLAGS = -fPIC" >> $TEMP_DIR/config.mk
- echo "SHLIB_LDFLAGS = -shared" >> $TEMP_DIR/config.mk
- fi
-fi
+write_toolchain_defaults()
+{
+ echo "# toolchain" >> "$1"
+ if [ -n "$TOOLCHAIN_CC" ]; then
+ echo "CC = ${TOOLCHAIN_CC}" >> "$1"
+ fi
+ if [ -n "$TOOLCHAIN_CXX" ]; then
+ echo "CXX = ${TOOLCHAIN_CXX}" >> "$1"
+ fi
+ echo >> "$1"
+ if [ -f "make/${TOOLCHAIN_NAME}.mk" ]; then
+ cat "make/${TOOLCHAIN_NAME}.mk" >> "$1"
+ elif [ -f "make/cc.mk" ]; then
+ cat "make/cc.mk" >> "$1"
+ else
+ echo "!!! WARNING !!! Default toolchain flags not found. Configuration might be incomplete."
+ fi
+}