Changeset d30e067 in mainline for configure.sh

Timestamp:

2025-03-02T20:02:33Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

• configure.sh (modified) (2 diffs)

configure.sh

@@ -110 +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"
@@ -119 +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