From bfc4b2330dac1cb765120f77471065d68f8f1dba Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Tue, 14 Dec 2021 10:58:51 -0600 Subject: [PATCH] make: Don't set CMAKE_SYSTEM_NAME=Linux This broke libaom optimization detection, since cmake appears not to set vars like CMAKE_SYSTEM_PROCESSOR if CMAKE_SYSTEM_NAME is set. --- make/rules-cmake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/rules-cmake.mk b/make/rules-cmake.mk index 0e18df97..c70751a2 100644 --- a/make/rules-cmake.mk +++ b/make/rules-cmake.mk @@ -17,7 +17,7 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/CMakeLists.txt -DCMAKE_INSTALL_PREFIX="$$($(2)_DST$(3))" \ -DCMAKE_INSTALL_LIBDIR="lib$(subst 32,,$(3))" \ -DCMAKE_BUILD_TYPE=plain \ - -DCMAKE_SYSTEM_NAME=$(if $(4),Windows,Linux) \ + -DCMAKE_SYSTEM_NAME=$(if $(4),Windows,) \ -DCMAKE_SHARED_LIBRARY_PREFIX_C=$(if $(4),,lib) \ -DCMAKE_IMPORT_LIBRARY_PREFIX_C=$(if $(4),,lib) \ $$($(2)_CMAKE_ARGS) \