From 0151da23d605c7709d432ebfb17a337a5f662839 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Sat, 6 Jun 2020 01:48:23 +0430
Subject: [PATCH] [meson] Remove with_libstdcxx build option

This was done in #770 but no indication of anyone is using it,
let's remove it from our meson port and we can just don't care about
it in autotools port after the migration to meson.
---
 meson_options.txt |  2 --
 src/meson.build   | 21 +++++----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index a6dea290c..e68a83fe8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -30,7 +30,5 @@ option('gtk_doc',  type : 'feature', value : 'auto', yield : true,
 
 option('icu_builtin', type: 'boolean', value: false,
   description: 'Don\'t separate ICU support as harfbuzz-icu module')
-option('with_libstdcxx', type: 'boolean', value: false,
-  description: 'Allow linking with libstdc++')
 option('experimental_api', type: 'boolean', value: false,
   description: 'Enable experimental APIs')
diff --git a/src/meson.build b/src/meson.build
index c85103d30..1238e0b6e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -365,13 +365,6 @@ if have_icu and have_icu_builtin
   harfbuzz_deps += [icu_dep]
 endif
 
-if get_option('with_libstdcxx')
-  chosen_linker = 'cpp'
-else
-  # Use a C linker, not C++; Don't link to libstdc++
-  chosen_linker = 'c'
-endif
-
 # harfbuzz
 gen_def = find_program('gen-def.py')
 
@@ -405,7 +398,7 @@ libharfbuzz = library('harfbuzz', hb_sources,
   soversion: hb_so_version,
   version: version,
   install: true,
-  link_language: chosen_linker,
+  link_language: 'c',
 )
 
 libharfbuzz_dep = declare_dependency(
@@ -428,7 +421,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
   soversion: hb_so_version,
   version: version,
   install: true,
-  link_language: chosen_linker,
+  link_language: 'c',
 )
 
 libharfbuzz_subset_dep = declare_dependency(
@@ -528,7 +521,7 @@ if have_icu and not have_icu_builtin
     version: version,
     install: true,
     # ICU links to stdc++ anyway so the default linker is good
-    # link_language: chosen_linker,
+    # link_language: 'c',
   )
 
   libharfbuzz_icu_dep = declare_dependency(
@@ -612,7 +605,7 @@ if have_gobject
     soversion: hb_so_version,
     version: version,
     install: true,
-    link_language: chosen_linker,
+    link_language: 'c',
   )
 
   gir = find_program('g-ir-scanner', required: get_option('introspection'))
@@ -680,11 +673,7 @@ if get_option('tests').enabled()
   env.set('HBHEADERS', ' '.join(hb_headers))
 
   if cpp.get_id() != 'msvc' and not meson.is_cross_build() # ensure the local tools are usable
-    # See https://github.com/mesonbuild/meson/pull/6838
-    if meson.version().version_compare('>=0.54.999') and not get_option('with_libstdcxx')
-      dist_check_script += 'check-libstdc++'
-    endif
-    dist_check_script += ['check-static-inits', 'check-symbols']
+    dist_check_script += ['check-libstdc++', 'check-static-inits', 'check-symbols']
   endif
 
   foreach name : dist_check_script