update cmake flag gcc

kulukami · Aug 22, 2023 · d6e280f · d6e280f
1 parent 4c28d86
commit d6e280f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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                                            \