Changeset d231a54 in mainline

Timestamp:

2025-02-24T11:12:39Z (19 hours ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Parents:

be62ebc

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-02-24 10:46:00)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-02-24 11:12:39)

Message:

Use clang compiler when configured as such

Files:

• configure.sh (modified) (2 diffs)
• kernel/meson.build (modified) (1 diff)
• tools/toolchain.sh (modified) (1 diff)

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
 

kernel/meson.build

@@ -117 +117 @@
 if not CONFIG_LINE_DEBUG
         # Keep the debug info needed to get file names for kernel stack traces.
-        kernel_c_args += [ '-gdwarf-5', '-g1', '-gno-statement-frontiers' ]
+        kernel_c_args += cc.get_supported_arguments([ '-gdwarf-5', '-g1', '-gno-statement-frontiers' ])
 endif
 

tools/toolchain.sh

@@ -512 +512 @@
         # Symlink clang and lld to the install path.
         CLANG="`which clang 2> /dev/null || echo "/usr/bin/clang"`"
+        CLANGPP="`which clang++ 2> /dev/null || echo "/usr/bin/clang++"`"
         LLD="`which ld.lld 2> /dev/null || echo "/usr/bin/ld.lld"`"
 
         ln -s $CLANG "${INSTALL_DIR}${CROSS_PREFIX}/bin/${TARGET}-clang"
+        ln -s $CLANGPP "${INSTALL_DIR}${CROSS_PREFIX}/bin/${TARGET}-clang++"
         ln -s $LLD "${INSTALL_DIR}${CROSS_PREFIX}/bin/${TARGET}-ld.lld"
 }