Changes in configure.sh [1c39d33b:d231a54] in mainline

File:

• configure.sh (modified) (6 diffs)

configure.sh

@@ -39 +39 @@
 CONFIG_RULES="${SOURCE_DIR}/HelenOS.config"
 CONFIG_DEFAULTS="${SOURCE_DIR}/defaults"
-
 
 test "$#" -eq 1 && { test "$1" = "-h" || test "$1" = "--help"; }
@@ -85 +84 @@
 fi
 
-if ! which meson; then
+if ! which meson >/dev/null 2>/dev/null; then
         echo "Your system does not have Meson installed."
         echo 'Please use `pip3 install meson`'
@@ -91 +90 @@
 fi
 
-if ! which ninja; then
+if ! which ninja >/dev/null 2>/dev/null; then
         echo "Your system does not have ninja installed."
         echo 'Please use `pip3 install ninja`'
@@ -98 +97 @@
 
 # Link tools directory for convenience.
-ln -s "${SOURCE_DIR}/tools" tools
+if [ ! -e tools ]; then
+        ln -s "${SOURCE_DIR}/tools" tools
+fi
 
 # Run HelenOS config tool.
@@ -109 +110 @@
 PLATFORM=`sed -n '/^PLATFORM\b/p' Makefile.config | sed 's:[^=]*= ::'`
 MACHINE=`sed -n '/^MACHINE\b/p' Makefile.config | sed 's:[^=]*= ::'`
+COMPILER=`sed -n '/^COMPILER\b/p' Makefile.config | sed 's:[^=]*= ::'`
 
 cross_target="$PLATFORM"
@@ -118 +120 @@
 fi
 
+if [ "$COMPILER" = 'clang' ]; then
+    cross_target="${cross_target}_clang"
+fi
+
 cross_def="${SOURCE_DIR}/meson/cross/${cross_target}"
 cc_arch=`sed -n "s:cc_arch = '\(.*\)':\1:p" "$cross_def"`
 
-compname="$cc_arch-helenos-gcc"
+if [ "$COMPILER" = 'clang' ]; then
+    compname="$cc_arch-helenos-clang"
+else
+    compname="$cc_arch-helenos-gcc"
+fi
+unset compprefix
 
-if which "$compname"; then
+if which "$compname" >/dev/null 2>/dev/null; then
         # Compiler is in PATH
         compprefix="$cc_arch-helenos-"
 
 elif [ -n "$CROSS_PREFIX" ]; then
-        if ! which "$CROSS_PREFIX/bin/$compname"; then
+        if which "$CROSS_PREFIX/bin/$compname" >/dev/null 2>/dev/null; then
+                compprefix="$CROSS_PREFIX/bin/$cc_arch-helenos-"
+        fi
+
+        if [ -z "$compprefix" ]; then
                 echo "ERROR: \$CROSS_PREFIX defined but $compname is not present in $CROSS_PREFIX/bin."
                 echo "Run tools/toolchain.sh to build cross-compiling toolchain."
                 exit 1
         fi
+else
+        if [ -z "$XDG_DATA_HOME" ]; then
+                        XDG_DATA_HOME="$HOME/.local/share"
+        fi
 
-        compprefix="$CROSS_PREFIX/bin/$cc_arch-helenos-"
-else
-        if ! which "/usr/local/cross/bin/$compname"; then
-                echo "ERROR: \$CROSS_PREFIX is not defined and $compname is not present in /usr/local/cross/bin."
+        if which "$XDG_DATA_HOME/HelenOS/cross/bin/$compname" >/dev/null 2>/dev/null; then
+                compprefix="$XDG_DATA_HOME/HelenOS/cross/bin/$cc_arch-helenos-"
+        elif which "/opt/HelenOS/cross/bin/$compname" >/dev/null 2>/dev/null; then
+                compprefix="/opt/HelenOS/cross/bin/$cc_arch-helenos-"
+        elif which "/usr/local/cross/bin/$compname" >/dev/null 2>/dev/null; then
+                compprefix="/usr/local/cross/bin/$cc_arch-helenos-"
+        fi
+
+        if [ -z "$compprefix" ]; then
+                echo "ERROR: \$CROSS_PREFIX is not defined and $compname is not present in any of the following standard locations."
+                echo " * $XDG_DATA_HOME/HelenOS/cross/bin"
+                echo " * /opt/HelenOS/cross/bin"
+                echo " * /usr/local/cross/bin"
                 echo "Run tools/toolchain.sh to build cross-compiling toolchain."
                 exit 1
         fi
-
-        compprefix="/usr/local/cross/bin/$cc_arch-helenos-"
 fi
 
 sed "s:@COMPPREFIX@:$compprefix:g" "$cross_def" > crossfile || exit 1
 
-meson "${SOURCE_DIR}" '.' --cross-file crossfile || exit 1
+meson setup "${SOURCE_DIR}" '.' --cross-file crossfile || exit 1
 
 echo