From 85556fd38b2742f0f057730563d21df6f6db6387 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 24 Oct 2024 22:51:15 +0300 Subject: [PATCH] meson: Drop malformed WEBRTC_ARCH_MIPS_FAMILY cflags argument The top-level meson.build file adds WEBRTC_ARCH_MIPS_FAMILY to arch_cflags for mips architectures, which causes the following error: [1/306] Compiling C++ object webrtc/rtc_base/liblibbase.a.p/synchronization_yield.cc.o FAILED: webrtc/rtc_base/liblibbase.a.p/synchronization_yield.cc.o c++ [...] -DWEBRTC_THREAD_RR WEBRTC_ARCH_MIPS_FAMILY -MD [...] ../webrtc/rtc_base/synchronization/yield.cc c++: warning: WEBRTC_ARCH_MIPS_FAMILY: linker input file unused because linking not done c++: error: WEBRTC_ARCH_MIPS_FAMILY: linker input file not found: No such file or directory It is supposed to be "-DWEBRTC_ARCH_MIPS_FAMILY". But, that macro is already defined in arch.h when building for mips: [30/306] Compiling C++ object webrtc/system_wrappers/libsystem_wrappers.a.p/source_cpu_features.cc.o In file included from ../webrtc/system_wrappers/source/cpu_features.cc:13: ../webrtc/rtc_base/system/arch.h:47:9: warning: "WEBRTC_ARCH_MIPS_FAMILY" redefined 47 | #define WEBRTC_ARCH_MIPS_FAMILY | ^~~~~~~~~~~~~~~~~~~~~~~ : note: this is the location of the previous definition Drop the broken, unnecessary argument from cflags. Signed-off-by: Alper Nebi Yasak --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index ebf053a..8d85d56 100644 --- a/meson.build +++ b/meson.build @@ -134,7 +134,6 @@ if cc.compiles('''#ifndef __aarch64__ endif if ['mips', 'mips64'].contains(host_machine.cpu_family()) have_mips = true - arch_cflags += ['WEBRTC_ARCH_MIPS_FAMILY'] endif if host_machine.cpu_family() == 'mips64' have_mips64 = true