[Scummvm-git-logs] scummvm branch-2-9 -> c97ace77d7b1714a0fc883499eb427f4b19e9458

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c97ace77d7 BUILD, MACOS: Restrict -force_cpusubtype_ALL flag to MacOS X PPC


Commit: c97ace77d7b1714a0fc883499eb427f4b19e9458
    https://github.com/scummvm/scummvm/commit/c97ace77d7b1714a0fc883499eb427f4b19e9458
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2024-12-06T15:40:12Z

Commit Message:
BUILD, MACOS: Restrict -force_cpusubtype_ALL flag to MacOS X PPC

Changed paths:
    configure
    ports.mk


diff --git a/configure b/configure
index 72b2758189f..cacc10675e3 100755
--- a/configure
+++ b/configure
@@ -3072,9 +3072,17 @@ EOF
 				add_line_to_config_mk 'MACOSX_64_BITS_ONLY = 1'
 			fi
 		fi
-		if test "$_host_cpu" = "aarch64" ; then
+
+		case $_host_cpu in
+		powerpc*)
+			# We use -force_cpusubtype_ALL to ensure the binary runs on every
+			# PowerPC machine.
+			append_var LDFLAGS "-force_cpusubtype_ALL"
+			;;
+		aarch64)
 			add_line_to_config_mk 'MACOSX_ARM64 = 1'
-		fi
+			;;
+		esac
 
 		# Avoid "file has no symbols" noise from ranlib, if it's new enough
 		ranlib_version=`$_ranlib -V 2>/dev/null`
diff --git a/ports.mk b/ports.mk
index 182e488588e..6e5f0b81b1e 100644
--- a/ports.mk
+++ b/ports.mk
@@ -588,10 +588,8 @@ endif
 endif
 
 # Special target to create a static linked binary for macOS.
-# We use -force_cpusubtype_ALL to ensure the binary runs on every
-# PowerPC machine.
 scummvm-static: $(DETECT_OBJS) $(OBJS)
-	+$(LD) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(PRE_OBJS_FLAGS) $(DETECT_OBJS) $(OBJS) $(POST_OBJS_FLAGS) \
+	+$(LD) $(LDFLAGS) -o scummvm-static $(PRE_OBJS_FLAGS) $(DETECT_OBJS) $(OBJS) $(POST_OBJS_FLAGS) \
 		-framework CoreMIDI \
 		$(OSX_STATIC_LIBS) \
 		$(OSX_ZLIB)