contrib: combine some checks and cosmetics.

8 files changed, 13 insertions, 30 deletions

diff --git a/contrib/libdav1d/module.defs b/contrib/libdav1d/module.defs
index 8f5a435f8..3f8321abd 100644
--- a/contrib/libdav1d/module.defs
+++ b/contrib/libdav1d/module.defs
@@ -29,12 +29,8 @@ else
     endif
 endif
 
-ifeq (arm64-darwin,$(HOST.machine)-$(HOST.system))
-    LIBDAV1D.CONFIGURE.extra += --cross-file=$(call fn.ABSOLUTE,$(LIBDAV1D.EXTRACT.dir/))/arm64-darwin-gcc.meson -Dc_args="-arch arm64"
-endif
-
-ifeq (x86_64-darwin,$(HOST.machine)-$(HOST.system))
-    LIBDAV1D.CONFIGURE.extra += --cross-file=$(call fn.ABSOLUTE,$(LIBDAV1D.EXTRACT.dir/))/x86_64-darwin-gcc.meson -Dc_args="-arch x86_64"
+ifeq (darwin,$(HOST.system))
+        LIBDAV1D.CONFIGURE.extra += --cross-file=$(call fn.ABSOLUTE,$(LIBDAV1D.EXTRACT.dir/))/$(HOST.machine)-darwin-gcc.meson -Dc_args="-arch $(HOST.machine)"
 endif
 
 ifeq (1-mingw,$(HOST.cross)-$(HOST.system))
diff --git a/contrib/libjpeg-turbo/module.defs b/contrib/libjpeg-turbo/module.defs
index 1518514c4..f6784d0cb 100644
--- a/contrib/libjpeg-turbo/module.defs
+++ b/contrib/libjpeg-turbo/module.defs
@@ -26,11 +26,8 @@ else
     endif
 endif
 
-ifeq (arm64-darwin,$(HOST.machine)-$(HOST.system))
-    LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_SYSTEM_PROCESSOR=arm64
-endif
-ifeq (x86_64-darwin,$(HOST.machine)-$(HOST.system))
-    LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_SYSTEM_PROCESSOR=x86_64
+ifeq (darwin,$(HOST.system))
+    LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
 endif
 
 ifeq (1,$(HOST.cross))
diff --git a/contrib/libopus/module.defs b/contrib/libopus/module.defs
index da684b99e..e8d436a87 100644
--- a/contrib/libopus/module.defs
+++ b/contrib/libopus/module.defs
@@ -19,4 +19,4 @@ ifeq (darwin,$(HOST.system))
     endif
 endif
 
-LIBOPUS.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -fiv;
\ No newline at end of file
+LIBOPUS.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -fiv;
diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs
index c5ca895cb..bbc1f1141 100644
--- a/contrib/libtheora/module.defs
+++ b/contrib/libtheora/module.defs
@@ -26,4 +26,4 @@ ifeq (darwin,$(HOST.system))
         LIBTHEORA.CONFIGURE.args.host = --host=$(HOST.machine:arm64=aarch64)-$(HOST.vendor)-$(HOST.system)
         LIBTHEORA.CONFIGURE.args.build = --build=$(BUILD.machine:arm64=aarch64)-$(BUILD.vendor)-$(BUILD.system)
     endif
-endif
\ No newline at end of file
+endif
diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs
index 2cfbb5246..4636e8dff 100644
--- a/contrib/libvorbis/module.defs
+++ b/contrib/libvorbis/module.defs
@@ -14,4 +14,4 @@ ifeq (darwin,$(HOST.system))
         LIBVORBIS.CONFIGURE.args.host = --host=$(HOST.machine:arm64=aarch64)-$(HOST.vendor)-$(HOST.system)
         LIBVORBIS.CONFIGURE.args.build = --build=$(BUILD.machine:arm64=aarch64)-$(BUILD.vendor)-$(BUILD.system)
     endif
-endif
\ No newline at end of file
+endif
diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs
index 5a08029b7..4e7a918e7 100644
--- a/contrib/x265_10bit/module.defs
+++ b/contrib/x265_10bit/module.defs
@@ -26,11 +26,8 @@ ifeq (size-aggressive,$(GCC.O))
     X265_10.CONFIGURE.extra += -DCMAKE_CXX_FLAGS_MINSIZEREL="-Oz -DNDEBUG" -DCMAKE_C_FLAGS_MINSIZEREL="-Oz -DNDEBUG"
 endif
 
-ifeq (arm64-darwin,$(HOST.machine)-$(HOST.system))
-        X265_10.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=arm64
-endif
-ifeq (x86_64-darwin,$(HOST.machine)-$(HOST.system))
-        X265_10.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=x86_64
+ifeq (darwin,$(HOST.system))
+    X265_10.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=$(HOST.machine)
 endif
 
 ifeq ($(GCC.O),$(filter $(GCC.O),size size-aggressive))
diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs
index f21238a58..87b6b238c 100644
--- a/contrib/x265_12bit/module.defs
+++ b/contrib/x265_12bit/module.defs
@@ -26,11 +26,8 @@ ifeq (size-aggressive,$(GCC.O))
     X265_12.CONFIGURE.extra += -DCMAKE_CXX_FLAGS_MINSIZEREL="-Oz -DNDEBUG" -DCMAKE_C_FLAGS_MINSIZEREL="-Oz -DNDEBUG"
 endif
 
-ifeq (arm64-darwin,$(HOST.machine)-$(HOST.system))
-        X265_12.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=arm64
-endif
-ifeq (x86_64-darwin,$(HOST.machine)-$(HOST.system))
-        X265_12.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=x86_64
+ifeq (darwin,$(HOST.system))
+    X265_12.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=$(HOST.machine)
 endif
 
 ifeq ($(GCC.O),$(filter $(GCC.O),size size-aggressive))
diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs
index 7f28dcd5b..d2d56dcd3 100644
--- a/contrib/x265_8bit/module.defs
+++ b/contrib/x265_8bit/module.defs
@@ -23,12 +23,8 @@ ifeq (size-aggressive,$(GCC.O))
     X265_8.CONFIGURE.extra += -DCMAKE_CXX_FLAGS_MINSIZEREL="-Oz -DNDEBUG" -DCMAKE_C_FLAGS_MINSIZEREL="-Oz -DNDEBUG"
 endif
 
-ifeq (arm64-darwin,$(HOST.machine)-$(HOST.system))
-        X265_8.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=arm64
-endif
-
-ifeq (x86_64-darwin,$(HOST.machine)-$(HOST.system))
-        X265_8.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=x86_64
+ifeq (darwin,$(HOST.system))
+    X265_8.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=$(HOST.machine)
 endif
 
 ifeq ($(GCC.O),$(filter $(GCC.O),size size-aggressive))