From d6e280f64ff8a24d6ee99416a232dd80169a157c Mon Sep 17 00:00:00 2001 From: ByteDance Date: Tue, 22 Aug 2023 18:11:42 +0800 Subject: [PATCH] update cmake flag gcc --- build_script/libclamav_linux_vcpkg_arm64.sh | 5 +++-- build_script/libclamav_osx_vcpkg_arm64.sh | 3 +-- build_script/libclamav_osx_vcpkg_x64.sh | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build_script/libclamav_linux_vcpkg_arm64.sh b/build_script/libclamav_linux_vcpkg_arm64.sh index 6bd9dd0..91fb867 100644 --- a/build_script/libclamav_linux_vcpkg_arm64.sh +++ b/build_script/libclamav_linux_vcpkg_arm64.sh @@ -27,12 +27,13 @@ git clone https://github.com/kulukami/clamav -b rel/1.1_yara_hit cd clamav mkdir build cd build -cmake .. -A arm64 \ +cmake .. \ -D CMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ -D VCPKG_TARGET_TRIPLET="$VCPKG_DEFAULT_TRIPLET" \ -D VCPKG_TARGET_ARCHITECTURE="$TARGET_ARCH" \ -D RUST_COMPILER_TARGET="$RUSTC_TARGET" \ - -D CMAKE_GENERATOR_PLATFORM="arm64" \ + -D CMAKE_C_COMPILER="aarch64-linux-gnu-gcc" \ + -D CMAKE_CXX_COMPILER="aarch64-linux-gnu-g++" \ -D ENABLE_TESTS=OFF \ -D ENABLE_STATIC_LIB=ON \ -D ENABLE_LIBCLAMAV_ONLY=ON \ diff --git a/build_script/libclamav_osx_vcpkg_arm64.sh b/build_script/libclamav_osx_vcpkg_arm64.sh index 21aa9b7..55d694b 100644 --- a/build_script/libclamav_osx_vcpkg_arm64.sh +++ b/build_script/libclamav_osx_vcpkg_arm64.sh @@ -26,14 +26,13 @@ git clone https://github.com/kulukami/clamav -b rel/1.1_yara_hit cd clamav mkdir build cd build -cmake .. -A arm64 \ +cmake .. \ -D CMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ -D VCPKG_TARGET_TRIPLET="$VCPKG_DEFAULT_TRIPLET" \ -D VCPKG_TARGET_ARCHITECTURE="$TARGET_ARCH" \ -D RUST_COMPILER_TARGET="$RUSTC_TARGET" \ -D CMAKE_SYSTEM_NAME=Darwin \ -D CMAKE_OSX_ARCHITECTURES="arm64" \ - -D CMAKE_GENERATOR_PLATFORM="arm64" \ -D ENABLE_TESTS=OFF \ -D ENABLE_STATIC_LIB=ON \ -D ENABLE_LIBCLAMAV_ONLY=ON \ diff --git a/build_script/libclamav_osx_vcpkg_x64.sh b/build_script/libclamav_osx_vcpkg_x64.sh index ed50b70..ab4b638 100644 --- a/build_script/libclamav_osx_vcpkg_x64.sh +++ b/build_script/libclamav_osx_vcpkg_x64.sh @@ -33,7 +33,6 @@ cmake .. \ -D RUST_COMPILER_TARGET="$RUSTC_TARGET" \ -D CMAKE_SYSTEM_NAME=Darwin \ -D CMAKE_OSX_ARCHITECTURES="x86_64" \ - -D CMAKE_GENERATOR_PLATFORM="x86_64" \ -D ENABLE_TESTS=OFF \ -D ENABLE_STATIC_LIB=ON \ -D ENABLE_LIBCLAMAV_ONLY=ON \