Commit: 3418d4a5e4513667055cf8650e4abe7c07b1833f - LFScripts (git)

Commit MetaInfo

• Revision: 3418d4a5e4513667055cf8650e4abe7c07b1833f (tree)
• Time: 2024-04-13 14:37:05
• Author: matsuand <30614168+matsuand@user...>
• Commiter: matsuand

Log Message

Update llvm-18.1.2.

Change Summary

• modified: BLFS/llvm.sh

Incremental Difference

--- a/BLFS/llvm.sh
+++ b/BLFS/llvm.sh
@@ -3,10 +3,10 @@
 . ./_blfsset.sh
 
 APPNAME=llvm
-VER=17.0.1
-VER_MAJOR=17
-VER_CLANG=17.0.1
-VER_CRT=17.0.1
+VER=18.1.2
+VER_MAJOR=18
+VER_CLANG=18.1.2
+VER_CRT=18.1.2
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.src.tar.xz
 TARGETDIR=$TARGET.src
@@ -38,9 +38,9 @@ cd $TARGETDIR
 tar -xf $DLD/llvm-cmake-${VER_MAJOR}.src.tar.xz       || exit 1
 tar -xf $DLD/llvm-third-party-${VER_MAJOR}.src.tar.xz || exit 1
 
-sed '/LLVM_COMMON_CMAKE_UTILS/s@../[e-mail]@'          \
+sed "/LLVM_COMMON_CMAKE_UTILS/s@../cmake@llvm-cmake-${VER_MAJOR}.src@"          \
     -i CMakeLists.txt
-sed '/LLVM_THIRD_PARTY_DIR/s@../[e-mail]@' \
+sed "/LLVM_THIRD_PARTY_DIR/s@../third-party@llvm-third-party-${VER_MAJOR}.src@" \
     -i cmake/modules/HandleLLVMOptions.cmake
 
 tar -xf $DLD/clang-${VER_CLANG}.src.tar.xz -C tools || exit 1
@@ -48,17 +48,12 @@ mv tools/clang-${VER_CLANG}.src tools/clang
 
 tar -xf $DLD/compiler-rt-${VER_CRT}.src.tar.xz -C projects || exit 1
 mv projects/compiler-rt-${VER_CRT}.src projects/compiler-rt
-sed '/^set(LLVM_COMMON_CMAKE_UTILS/d'                   \
-    -i projects/compiler-rt/CMakeLists.txt
 
 grep -rl '#!.*python' | xargs sed -i '1s/python$/python3/'
 
-Patching
-patch -Np2 -d tools/clang <$DLD/clang-${VER_MAJOR}-enable_default_ssp-1.patch \
-	1> $LOG/$TARGET.0_patch.log 2>&1 || exit 1
-
-sed 's/clang_dfsan/& -fno-stack-protector/' \
-    -i projects/compiler-rt/test/dfsan/origin_unaligned_memtrans.c
+#Patching
+#patch -Np2 -d tools/clang <$DLD/clang-${VER_MAJOR}-enable_default_ssp-1.patch \
+#	1> $LOG/$TARGET.0_patch.log 2>&1 || exit 1
 
 mkdir build
 cd    build
@@ -73,8 +68,10 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr           \
       -DLLVM_ENABLE_RTTI=ON                 \
       -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
       -DLLVM_BINUTILS_INCDIR=/usr/include   \
+      -DLLVM_VERSION_SUFFIX=                \
       -DLLVM_INCLUDE_BENCHMARKS=OFF         \
       -DCLANG_DEFAULT_PIE_ON_LINUX=ON       \
+      -DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang \
       -Wno-dev -G Ninja .. \
 	1> $LOG/$TARGET.1_conf.log 2>&1 || exit 1