1.1 --- a/configure Wed Jan 17 21:01:50 2024 +0100
1.2 +++ b/configure Sat Jan 20 16:02:04 2024 +0100
1.3 @@ -163,17 +163,17 @@
1.4 printf "detect platform... "
1.5 if [ "$OS" = "SunOS" ]; then
1.6 PLATFORM="solaris sunos unix svr4"
1.7 -fi
1.8 -if [ "$OS" = "Linux" ]; then
1.9 +elif [ "$OS" = "Linux" ]; then
1.10 PLATFORM="linux unix"
1.11 -fi
1.12 -if [ "$OS" = "FreeBSD" ]; then
1.13 +elif [ "$OS" = "FreeBSD" ]; then
1.14 PLATFORM="freebsd bsd unix"
1.15 -fi
1.16 -if [ "$OS" = "Darwin" ]; then
1.17 +elif [ "$OS" = "OpenBSD" ]; then
1.18 + PLATFORM="openbsd bsd unix"
1.19 +elif [ "$OS" = "NetBSD" ]; then
1.20 + PLATFORM="netbsd bsd unix"
1.21 +elif [ "$OS" = "Darwin" ]; then
1.22 PLATFORM="macos osx bsd unix"
1.23 -fi
1.24 -if echo "$OS" | grep -i "MINGW" > /dev/null; then
1.25 +elif echo "$OS" | grep -i "MINGW" > /dev/null; then
1.26 PLATFORM="windows mingw"
1.27 fi
1.28 : ${PLATFORM:="unix"}
1.29 @@ -201,6 +201,26 @@
1.30 done
1.31 return 0
1.32 }
1.33 +istoolchain()
1.34 +{
1.35 + for t in $TOOLCHAIN
1.36 + do
1.37 + if [ "$t" = "$1" ]; then
1.38 + return 0
1.39 + fi
1.40 + done
1.41 + return 1
1.42 +}
1.43 +notistoolchain()
1.44 +{
1.45 + for t in $TOOLCHAIN
1.46 + do
1.47 + if [ "$t" = "$1" ]; then
1.48 + return 1
1.49 + fi
1.50 + done
1.51 + return 0
1.52 +}
1.53
1.54
1.55 # generate vars.mk
1.56 @@ -267,9 +287,12 @@
1.57 dependency_error_coverage()
1.58 {
1.59 print_check_msg "$dep_checked_coverage" "checking for coverage... "
1.60 - # dependency coverage
1.61 + # dependency coverage toolchain="gnuc"
1.62 while true
1.63 do
1.64 + if notistoolchain "gnuc"; then
1.65 + break
1.66 + fi
1.67 TEMP_CFLAGS="$TEMP_CFLAGS \${COVERAGE_CFLAGS}"
1.68 TEMP_LDFLAGS="$TEMP_LDFLAGS \${COVERAGE_LDFLAGS}"
1.69 print_check_msg "$dep_checked_coverage" "yes\n"
1.70 @@ -453,10 +476,10 @@
1.71
1.72 # add general dependency flags to flags.mk
1.73 echo "# general flags" >> "$TEMP_DIR/flags.mk"
1.74 -if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then
1.75 +if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then
1.76 echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk"
1.77 fi
1.78 -if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then
1.79 +if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then
1.80 echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
1.81 fi
1.82 if [ -n "${TEMP_LDFLAGS}" ]; then
1.83 @@ -639,10 +662,10 @@
1.84 fi
1.85 fi
1.86
1.87 -if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then
1.88 +if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then
1.89 echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk"
1.90 fi
1.91 -if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then
1.92 +if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then
1.93 echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
1.94 fi
1.95 if [ "$BUILD_TYPE" = "debug" ]; then
1.96 @@ -699,6 +722,3 @@
1.97 write_toolchain_defaults "$TEMP_DIR/toolchain.mk"
1.98 cat "$TEMP_DIR/vars.mk" "$TEMP_DIR/toolchain.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
1.99 rm -Rf "$TEMP_DIR"
1.100 -
1.101 -
1.102 -
