From 30a50417991b9ba86ea98d9b329fcc06aa536a20 Mon Sep 17 00:00:00 2001 From: Vasyl Gello Date: Thu, 9 Nov 2023 12:41:06 +0200 Subject: [PATCH] Dont mess CROSS with CC/CXX/etc Signed-off-by: Vasyl Gello --- res/vcpkg/libvpx/portfile.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/res/vcpkg/libvpx/portfile.cmake b/res/vcpkg/libvpx/portfile.cmake index 3eaa940b3..8bf06f0e8 100644 --- a/res/vcpkg/libvpx/portfile.cmake +++ b/res/vcpkg/libvpx/portfile.cmake @@ -174,6 +174,7 @@ else() set(ENV{AR} ${VCPKG_DETECTED_CMAKE_AR}) set(ENV{LD} ${VCPKG_DETECTED_CMAKE_LINKER}) set(ENV{RANLIB} ${VCPKG_DETECTED_CMAKE_RANLIB}) + set(ENV{STRIP} ${VCPKG_DETECTED_CMAKE_STRIP}) if(VCPKG_TARGET_IS_MINGW) if(LIBVPX_TARGET_ARCH STREQUAL "x86") @@ -186,6 +187,12 @@ else() if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm AND NOT VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm) message(STATUS "Cross-building for arm-linux with arm-linux-gnueabihf") set(ENV{CROSS} "arm-linux-gnueabihf-") + unset(ENV{CC}) + unset(ENV{CXX}) + unset(ENV{AR}) + unset(ENV{LD}) + unset(ENV{RANLIB}) + unset(ENV{STRIP}) endif() elseif(VCPKG_TARGET_IS_ANDROID) set(LIBVPX_TARGET "generic-gnu")