From d9177a594bc2846b03a43b8d00949d23ab0d91c2 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Thu, 21 May 2020 19:34:56 +0430 Subject: [PATCH] [meson] Use a c linker for on Windows also Using a C linker was limited to non-Windows as 20a840c7, let's revisit this while transition to meson. Packagers easily override that via the option and use a C++ linker if needed. --- src/meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index b150d66ba..5c8b780d2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -364,12 +364,9 @@ if have_icu and have_icu_builtin deps += [icu_dep] endif -if host_machine.system() == 'windows' or get_option('with_libstdcxx') +if not get_option('with_libstdcxx') chosen_linker = 'cpp' else - # our autotools port was limiting this to HAVE_GCC as https://github.com/harfbuzz/harfbuzz/commit/e784632 - # let's see if that is needed anymore - # Use a C linker, not C++; Don't link to libstdc++ chosen_linker = 'c' endif