Fix cross-compilation detection

tresf · May 25, 2024 · 25163d5 · 25163d5
1 parent 1a1474f
commit 25163d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -204,7 +204,8 @@ jobs:
                 -B build \
                 -DCMAKE_INSTALL_PREFIX="../target" \
                 -DCMAKE_OSX_ARCHITECTURES=arm64 \
-                -DCMAKE_PREFIX_PATH="$(~/wrongbrew.sh --prefix);$(~/wrongbrew.sh --prefix qt@5)" \                      $CMAKE_OPTS \
+                -DCMAKE_PREFIX_PATH="$(~/wrongbrew.sh --prefix);$(~/wrongbrew.sh --prefix qt@5)" \
+                $CMAKE_OPTS \
                 -DUSE_WERROR=OFF
       - name: Build
         run: cmake --build build

diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake
@@ -161,8 +161,7 @@ ENDIF(LMMS_BUILD_WIN32)
 
 IF(LMMS_BUILD_APPLE)
 	# Detect cross-compilation.  "wrongbrew" is a custom wrapper for homebrew
-	IF((CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" AND NOT LMMS_HOST_X86_64) OR
-		(CMAKE_OSX_ARCHITECTURES MATCHES "arm64" AND NOT LMMS_HOST_ARM64))
+	IF(CMAKE_APPLE_SILICON_PROCESSOR MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
 		EXECUTE_PROCESS(COMMAND "$ENV{HOME}/wrongbrew.sh" --prefix RESULT_VARIABLE DETECT_WRONGBREW OUTPUT_VARIABLE WRONGBREW_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 	ENDIF()