fix(toolchain): 移除合并冲突标记并改进配置验证

重构配置验证逻辑以更精确检查cmake依赖
当使用系统cmake时增加额外检查

Author: QuantumMisaka

toolchain/scripts/lib/config_validator.sh

@@ -138,10 +138,27 @@ validate_compiler_consistency() {
 # Check system requirements
 # Usage: validate_system_requirements
 validate_system_requirements() {
-    # Check for required system tools
-    local required_tools=("make" "cmake" "git" "wget" "tar" "gzip")
+    # ABACUS itself and some dependencies require cmake.
+    # Check cmake requirement based on configuration (mirrors original L768-772)
+    if [[ "${CONFIG_CACHE[with_cmake]}" == "__DONTUSE__" ]]; then
+        add_validation_error "CMake is required for ABACUS and some dependencies. Please enable it."
+        add_validation_error ""
+        add_validation_error "SOLUTION: Use '--with-cmake=install' to automatically install CMake:"
+        add_validation_error "  ./install_abacus_toolchain_new.sh --with-cmake=install [other options]"
+        return
+    fi
+    
+    # Check for required system tools (excluding cmake which is handled above)
+    local required_tools=("make" "git" "wget" "tar" "gzip")
     local missing_tools=()
 
+    # Only check for system cmake if using system cmake
+    if [[ "${CONFIG_CACHE[with_cmake]}" == "__SYSTEM__" ]]; then
+        if ! command -v "cmake" &> /dev/null; then
+            missing_tools+=("cmake")
+        fi
+    fi
+    
     for tool in "${required_tools[@]}"; do
         if ! command -v "$tool" &> /dev/null; then
             missing_tools+=("$tool")

toolchain/toolchain_aocc-aocl.sh

@@ -8,7 +8,6 @@
 # Users can easily modify these parameters to customize the build
 # Before running this script, ensure you have loaded your system packages
 
-<<<<<<< HEAD
 # Compiler Configuration
 TOOLCHAIN_COMPILER="aocc-aocl"
 WITH_AMD="system"

toolchain/toolchain_gcc-aocl.sh

@@ -14,7 +14,6 @@ WITH_GCC="system"
 WITH_AMD="no"
 WITH_INTEL="no"
 
-<<<<<<< HEAD
 # Math Libraries (AMD AOCL recommended)
 MATH_MODE="aocl"
 WITH_AOCL="system"